[xiph-commits] r3047 - in liboggplay/trunk: plugin src/tools

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-25 06:10:49 -0700 (Mon, 25 Jun 2007)
New Revision: 3047

Modified:
   liboggplay/trunk/plugin/plugin_gui_linux.c
   liboggplay/trunk/src/tools/glut-player.c
Log:
Switched frames back on in glut-player (whoops)
playback_target now a .16 value in plugin_gui_linux - this allows inter-frame
timing of non-integral numbers of milliseconds



Modified: liboggplay/trunk/plugin/plugin_gui_linux.c
===================================================================
--- liboggplay/trunk/plugin/plugin_gui_linux.c	2007-06-25 12:15:46 UTC (rev 3046)
+++ liboggplay/trunk/plugin/plugin_gui_linux.c	2007-06-25 13:10:49 UTC (rev 3047)
@@ -174,7 +174,7 @@
   if (info->audio_opened == FALSE) 
 #endif
   {
-    info->playback_target = oggplay_sys_time_in_ms(); 
+    info->playback_target = oggplay_sys_time_in_ms() << 16; 
   }
  
   if (frame_data.cmml_strings != NULL) {      
@@ -215,8 +215,8 @@
 
   free_oggplay_frame(info->ogg_handle, &frame_data);
 
-  info->playback_target += get_callback_period(info->ogg_handle) >> 16;
-  offset = info->playback_target - cur_time;
+  info->playback_target += get_callback_period(info->ogg_handle);
+  offset = (info->playback_target >> 16) - cur_time;
   //printf("target: %lld offset: %lld\n", info->playback_target, offset);
 
   if (offset < OGGPLAY_FRAME_SKIP_OFFSET) {

Modified: liboggplay/trunk/src/tools/glut-player.c
===================================================================
--- liboggplay/trunk/src/tools/glut-player.c	2007-06-25 12:15:46 UTC (rev 3046)
+++ liboggplay/trunk/src/tools/glut-player.c	2007-06-25 13:10:49 UTC (rev 3047)
@@ -63,7 +63,7 @@
 static int video_track;
 static int audio_track;
 
-#define DISPLAY_FRAMES 0
+#define DISPLAY_FRAMES 1
 
 #define PERIOD_SIZE   512