[xiph-commits] r3141 - liboggplay/trunk/plugin

[laser13 at svn.annodex.net]

Author: laser13
Date: 2007-06-28 20:04:12 -0700 (Thu, 28 Jun 2007)
New Revision: 3141

Modified:
   liboggplay/trunk/plugin/plugin_gui_win32.c
Log:
Win32 GUI - killing display timer before shut_oggplay is called.

Modified: liboggplay/trunk/plugin/plugin_gui_win32.c
===================================================================
--- liboggplay/trunk/plugin/plugin_gui_win32.c	2007-06-29 02:29:35 UTC (rev 3140)
+++ liboggplay/trunk/plugin/plugin_gui_win32.c	2007-06-29 03:04:12 UTC (rev 3141)
@@ -227,17 +227,17 @@
     close_audio(info);
   }
 #endif   
+  KillTimer(info->window, IDT_DISPLAY_TIMER);
+
   SubclassWindow((HWND)(info->window), (WNDPROC)(info->old_wnd_proc));    
   
   SEM_CLOSE(info->oggplay_replace_sem);    
   
-  shut_oggplay(info->oggplay_handle);  
-  
-  KillTimer(info->window, IDT_DISPLAY_TIMER);
+  shut_oggplay(info->oggplay_handle);      
  
-  if (info->frame_data != NULL) {
+  /*if (info->frame_data != NULL) {
     free(info->frame_data);
-  }
+  }*/
   free(info);
   printf("all closed all done\n");
 
@@ -390,7 +390,7 @@
   InvalidateRect(hWnd, &r, FALSE);
   UpdateWindow(hWnd);  
   
-  if (info->playback_state == PAUSED) {
+  if (info->playback_state == PAUSED) {      
       info->set_to_pause = FALSE;
   }
   /* below: audio, timing calculations and frame skipping */