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

[laser13 at svn.annodex.net]

Author: laser13
Date: 2007-06-17 20:33:32 -0700 (Sun, 17 Jun 2007)
New Revision: 2974

Modified:
   liboggplay/trunk/include/oggplay/oggplay.h
   liboggplay/trunk/include/oggplay/oggplay_enums.h
   liboggplay/trunk/src/liboggplay/oggplay.c
   liboggplay/trunk/src/liboggplay/oggplay_buffer.c
   liboggplay/trunk/src/liboggplay/oggplay_private.h
Log:



Modified: liboggplay/trunk/include/oggplay/oggplay.h
===================================================================
--- liboggplay/trunk/include/oggplay/oggplay.h	2007-06-18 03:03:55 UTC (rev 2973)
+++ liboggplay/trunk/include/oggplay/oggplay.h	2007-06-18 03:33:32 UTC (rev 2974)
@@ -105,9 +105,6 @@
 oggplay_get_video_fps(OggPlay *me, int track, int* fps_denom, int* fps_num);
 
 OggPlayErrorCode
-oggplay_get_stream_state(OggPlay *me, OggPlayStreamState* state);
-
-OggPlayErrorCode
 oggplay_start_decoding(OggPlay *me);
 
 OggPlayErrorCode

Modified: liboggplay/trunk/include/oggplay/oggplay_enums.h
===================================================================
--- liboggplay/trunk/include/oggplay/oggplay_enums.h	2007-06-18 03:03:55 UTC (rev 2973)
+++ liboggplay/trunk/include/oggplay/oggplay_enums.h	2007-06-18 03:33:32 UTC (rev 2974)
@@ -79,10 +79,4 @@
   OGGPLAY_STREAM_LAST_DATA = 3
 } OggPlayStreamInfo;
 
-typedef enum OggPlayStreamState {
-    UNINITIALISED	= 0,
-    STREAM_STARTED 	= 1,
-    STREAM_FINISHED	= 2
-} OggPlayStreamState;
-
 #endif

Modified: liboggplay/trunk/src/liboggplay/oggplay.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay.c	2007-06-18 03:03:55 UTC (rev 2973)
+++ liboggplay/trunk/src/liboggplay/oggplay.c	2007-06-18 03:33:32 UTC (rev 2974)
@@ -64,8 +64,7 @@
   me->callback = NULL;
   me->target = 0L;
   me->active_tracks = 0;
-  me->buffer = NULL;
-  me->state = UNINITIALISED;
+  me->buffer = NULL;  
 
   return me;
 
@@ -363,17 +362,6 @@
 
 }
 
-OggPlayErrorCode
-oggplay_get_stream_state(OggPlay *me, OggPlayStreamState* state) {
-  if (me == NULL) {
-    return E_OGGPLAY_BAD_OGGPLAY;
-  }
-  
-  *state = me->state;
-
-  return E_OGGPLAY_OK;
-}
-
 #define MAX_CHUNK_COUNT   10
 
 OggPlayErrorCode

Modified: liboggplay/trunk/src/liboggplay/oggplay_buffer.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_buffer.c	2007-06-18 03:03:55 UTC (rev 2973)
+++ liboggplay/trunk/src/liboggplay/oggplay_buffer.c	2007-06-18 03:33:32 UTC (rev 2974)
@@ -211,12 +211,7 @@
  
   next_loc = WRAP_INC(buffer->last_emptied, buffer->buffer_size);
 
-  if (buffer->buffer_list[next_loc] == NULL) {
-    if (me->state == UNINITIALISED) { // mark first frame
-        me->state = STREAM_STARTED;
-    } else if (me->state == STREAM_STARTED) { // mark last frame
-        //me->state = STREAM_FINISHED; NO!!! <- Shane
-    }
+  if (buffer->buffer_list[next_loc] == NULL) {    
     return NULL;
   }
 

Modified: liboggplay/trunk/src/liboggplay/oggplay_private.h
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_private.h	2007-06-18 03:03:55 UTC (rev 2973)
+++ liboggplay/trunk/src/liboggplay/oggplay_private.h	2007-06-18 03:33:32 UTC (rev 2974)
@@ -176,8 +176,7 @@
   void                * callback_user_ptr;
   ogg_int64_t           target;
   int                   active_tracks;
-  OggPlayBuffer       * buffer;
-  OggPlayStreamState    state;
+  OggPlayBuffer       * buffer;  
   ogg_int64_t           presentation_time;
   ogg_int64_t           presentation_time_millis;
 };