[xiph-commits] r2976 - in liboggplay/trunk: include/oggplay src/tools

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-17 20:56:15 -0700 (Sun, 17 Jun 2007)
New Revision: 2976

Modified:
   liboggplay/trunk/include/oggplay/oggplay_callback_info.h
   liboggplay/trunk/src/tools/glut-player.c
Log:
Removed old StreamState stuff from glut-player
Added function prototype for oggplay_callback_info_get_stream_info



Modified: liboggplay/trunk/include/oggplay/oggplay_callback_info.h
===================================================================
--- liboggplay/trunk/include/oggplay/oggplay_callback_info.h	2007-06-18 03:40:34 UTC (rev 2975)
+++ liboggplay/trunk/include/oggplay/oggplay_callback_info.h	2007-06-18 03:56:15 UTC (rev 2976)
@@ -73,6 +73,9 @@
 OggPlayTextData *
 oggplay_callback_info_get_text_data(OggPlayDataHeader *header);
 
+OggPlayStreamInfo
+oggplay_callback_info_get_stream_info(OggPlayCallbackInfo *info);
+
 void
 oggplay_callback_info_lock_item(OggPlayDataHeader *header);
 

Modified: liboggplay/trunk/src/tools/glut-player.c
===================================================================
--- liboggplay/trunk/src/tools/glut-player.c	2007-06-18 03:40:34 UTC (rev 2975)
+++ liboggplay/trunk/src/tools/glut-player.c	2007-06-18 03:56:15 UTC (rev 2976)
@@ -30,8 +30,6 @@
 #define USE_AUDIO 0
 #endif
 
-#define USE_AUDIO 0
-
 #if USE_AUDIO
 #include <sys/soundcard.h>
 
@@ -211,7 +209,6 @@
   OggPlayDataType         type;
   int                     num_tracks;
   OggPlayCallbackInfo  ** track_info;  
-  OggPlayStreamState      state;
   static unsigned int     target      = 0;
 #ifdef DEBUG
   int 			  bytes_per_frame = 0;
@@ -225,11 +222,7 @@
   
   //while (1) { 
     track_info = oggplay_buffer_retrieve_next(player);
-    oggplay_get_stream_state(player, &state);
-    if (state == STREAM_FINISHED) {
-        sem_post(&stop_sem);
-        pthread_exit(NULL);
-    }
+    
     if (track_info == NULL) {
       ts.tv_nsec = 40000000;
       nanosleep(&ts, NULL);