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

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-26 21:10:29 -0700 (Tue, 26 Jun 2007)
New Revision: 3079

Modified:
   liboggplay/trunk/plugin/plugin_gui_linux.c
Log:
Reordered maybe_switch_oggplays so that it's called at the same location as
the mac gui



Modified: liboggplay/trunk/plugin/plugin_gui_linux.c
===================================================================
--- liboggplay/trunk/plugin/plugin_gui_linux.c	2007-06-27 04:03:15 UTC (rev 3078)
+++ liboggplay/trunk/plugin/plugin_gui_linux.c	2007-06-27 04:10:29 UTC (rev 3079)
@@ -143,7 +143,11 @@
   frame_data.cmml_strings = NULL;
   frame_data.size = 0;
 
-  // check if we should pause display
+  maybe_switch_oggplays(info);
+
+  /*
+   * if we are paused, then don't do anything
+   */
   if (info->playback_state == PAUSED) {
     return TRUE;
   }
@@ -153,15 +157,12 @@
     Imlib_Image image;
 
     convert_oggplay_frame(info->ogg_handle, &frame_data, BGR);
-    /* display frame */
-    //printf ("Got a frame to display\n");
     image = imlib_create_image_using_data(frame_data.width, 
                     frame_data.height, (unsigned int *)frame_data.frame);
     imlib_context_set_image(image);
     imlib_render_image_on_drawable_at_size(0, 0, info->width, info->height);
     imlib_free_image_and_decache();
   } else if (frame_data.samples == NULL) {
-    maybe_switch_oggplays(info);
     return TRUE;
   }
 
@@ -226,10 +227,6 @@
     offset = OGGPLAY_MIN_OFFSET;
   }
  
-  if(maybe_switch_oggplays(info)) {
-    offset = 10;
-  }
-
   info->timeout_id = g_timeout_add((int)offset, update_frame, (gpointer)info);
   return FALSE;
 }