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

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-05-02 02:50:16 -0700 (Fri, 02 May 2008)
New Revision: 3581

Modified:
   liboggplay/trunk/include/oggplay/oggplay_callback_info.h
   liboggplay/trunk/src/examples/glut-player.c
   liboggplay/trunk/src/liboggplay/oggplay_callback_info.c
   liboggplay/trunk/src/liboggplay/oggplay_private.h
Log:
update return value of samples_in_record consistently (ogg_int64_t)
Updated patch from ogg.k.ogg.k


Modified: liboggplay/trunk/include/oggplay/oggplay_callback_info.h
===================================================================
--- liboggplay/trunk/include/oggplay/oggplay_callback_info.h	2008-05-02 04:37:24 UTC (rev 3580)
+++ liboggplay/trunk/include/oggplay/oggplay_callback_info.h	2008-05-02 09:50:16 UTC (rev 3581)
@@ -61,7 +61,7 @@
 OggPlayDataHeader **
 oggplay_callback_info_get_headers(OggPlayCallbackInfo *info);
 
-int
+ogg_int64_t
 oggplay_callback_info_get_record_size(OggPlayDataHeader *header);
 
 OggPlayVideoData *

Modified: liboggplay/trunk/src/examples/glut-player.c
===================================================================
--- liboggplay/trunk/src/examples/glut-player.c	2008-05-02 04:37:24 UTC (rev 3580)
+++ liboggplay/trunk/src/examples/glut-player.c	2008-05-02 09:50:16 UTC (rev 3581)
@@ -298,7 +298,7 @@
         case OGGPLAY_KATE:
           required = oggplay_callback_info_get_required(track_info[i]);
           for (j = 0; j < required; j++) {
-            printf("[%d] [duration %ld] %s\n",
+            printf("[%d] [duration %lld] %s\n",
                 i,
                 oggplay_callback_info_get_record_size(headers[j]),
                 oggplay_callback_info_get_text_data(headers[j]));

Modified: liboggplay/trunk/src/liboggplay/oggplay_callback_info.c
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_callback_info.c	2008-05-02 04:37:24 UTC (rev 3580)
+++ liboggplay/trunk/src/liboggplay/oggplay_callback_info.c	2008-05-02 09:50:16 UTC (rev 3581)
@@ -357,7 +357,7 @@
 /** 
  * Returns number of samples in the record 
  * Note: the resulting data include samples for all audio channels */
-int
+ogg_int64_t
 oggplay_callback_info_get_record_size(OggPlayDataHeader *header) {
 
   if (header == NULL) {

Modified: liboggplay/trunk/src/liboggplay/oggplay_private.h
===================================================================
--- liboggplay/trunk/src/liboggplay/oggplay_private.h	2008-05-02 04:37:24 UTC (rev 3580)
+++ liboggplay/trunk/src/liboggplay/oggplay_private.h	2008-05-02 09:50:16 UTC (rev 3581)
@@ -71,7 +71,7 @@
   int                         lock;
   struct _OggPlayDataHeader * next;
   ogg_int64_t                 presentation_time;
-  int                         samples_in_record;
+  ogg_int64_t                 samples_in_record;
   int                         has_been_presented;
 };