[xiph-commits] r3016 - liboggplay/trunk/src/liboggplay

[shans at svn.annodex.net]

Author: shans
Date: 2007-06-21 03:14:41 -0700 (Thu, 21 Jun 2007)
New Revision: 3016

Modified:
   liboggplay/trunk/src/liboggplay/oggplay.c
   liboggplay/trunk/src/liboggplay/oggplay_buffer.c
   liboggplay/trunk/src/liboggplay/oggplay_callback.c
   liboggplay/trunk/src/liboggplay/oggplay_private.h
Log:
Removed presentation_time_millis - it's not used for anything



Modified: liboggplay/trunk/src/liboggplay/oggplay.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay.c	2007-06-21 03:59:37 UTC (rev 3015)
+++ liboggplay/trunk/src/liboggplay/oggplay.c	2007-06-21 10:14:41 UTC (rev 3016)
@@ -88,7 +88,6 @@
    * We'll reinitialise it when/if we encounter a skeleton header
    */
   me->presentation_time = 0;
-  me->presentation_time_millis = 0;
   
   /*
    * start to retrieve data, until we get all of the track info.  We need

Modified: liboggplay/trunk/src/liboggplay/oggplay_buffer.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_buffer.c	2007-06-21 03:59:37 UTC (rev 3015)
+++ liboggplay/trunk/src/liboggplay/oggplay_buffer.c	2007-06-21 10:14:41 UTC (rev 3016)
@@ -313,3 +313,4 @@
   }
 
 }
+

Modified: liboggplay/trunk/src/liboggplay/oggplay_callback.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_callback.c	2007-06-21 03:59:37 UTC (rev 3015)
+++ liboggplay/trunk/src/liboggplay/oggplay_callback.c	2007-06-21 10:14:41 UTC (rev 3016)
@@ -254,9 +254,6 @@
     
     /* initialise the presentation times in the player to the values recorded in the skeleton */
     decoder->decoder.player->presentation_time = decoder->presentation_time;
-    decoder->decoder.player->presentation_time_millis = decoder->presentation_time >> 16;
-    decoder->decoder.player->presentation_time_millis *= 1000;
-    decoder->decoder.player->presentation_time_millis >>= 16;
   } else {
     int i;
     long          preroll       = extract_int32(op->packet + 44);

Modified: liboggplay/trunk/src/liboggplay/oggplay_private.h
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_private.h	2007-06-21 03:59:37 UTC (rev 3015)
+++ liboggplay/trunk/src/liboggplay/oggplay_private.h	2007-06-21 10:14:41 UTC (rev 3016)
@@ -163,6 +163,11 @@
   int     last_emptied;
 } OggPlayBuffer;
 
+typedef struct {
+  OggPlayDataHeader   * old_data;
+  OggPlayBuffer       * old_buffer;
+} OggPlaySeekTrash;
+
 struct _OggPlay {
   OggPlayReader       * reader;
   OGGZ                * oggz;
@@ -177,7 +182,6 @@
   int                   active_tracks;
   OggPlayBuffer       * buffer;  
   ogg_int64_t           presentation_time;
-  ogg_int64_t           presentation_time_millis;
 };
 
 void