[xiph-commits] r3364 - liboggz/trunk/src/liboggz

[conrad at svn.annodex.net]

Author: conrad
Date: 2008-01-20 17:27:10 -0800 (Sun, 20 Jan 2008)
New Revision: 3364

Modified:
   liboggz/trunk/src/liboggz/oggz_auto.c
   liboggz/trunk/src/liboggz/oggz_private.h
   liboggz/trunk/src/liboggz/oggz_read.c
Log:
rename private oggz_auto_identify() to oggz_auto_identify_page()
This function is used by oggz_read to identify a bos page as soon as it is
read, before any packet extraction is done. We do this on a page so that the
content-type is known before the user's read_page callback is called.


Modified: liboggz/trunk/src/liboggz/oggz_auto.c
===================================================================
--- liboggz/trunk/src/liboggz/oggz_auto.c	2008-01-18 07:10:32 UTC (rev 3363)
+++ liboggz/trunk/src/liboggz/oggz_auto.c	2008-01-21 01:27:10 UTC (rev 3364)
@@ -892,8 +892,9 @@
   {"", 0, "Unknown", NULL, NULL, NULL}
 }; 
 
-int oggz_auto_identify (OGGZ *oggz, ogg_page *og, long serialno) {
-
+int
+oggz_auto_identify_page (OGGZ *oggz, ogg_page *og, long serialno)
+{
   int i;
   
   for (i = 0; i < OGGZ_CONTENT_UNKNOWN; i++)

Modified: liboggz/trunk/src/liboggz/oggz_private.h
===================================================================
--- liboggz/trunk/src/liboggz/oggz_private.h	2008-01-18 07:10:32 UTC (rev 3363)
+++ liboggz/trunk/src/liboggz/oggz_private.h	2008-01-21 01:27:10 UTC (rev 3364)
@@ -290,7 +290,7 @@
 oggz_auto_read_comments (OGGZ * oggz, oggz_stream_t * stream, long serialno,
                          ogg_packet * op);
 
-int oggz_auto_identify (OGGZ *oggz, ogg_page *og, long serialno);
+int oggz_auto_identify_page (OGGZ *oggz, ogg_page *og, long serialno);
 
 /* comments */
 int oggz_comments_init (oggz_stream_t * stream);

Modified: liboggz/trunk/src/liboggz/oggz_read.c
===================================================================
--- liboggz/trunk/src/liboggz/oggz_read.c	2008-01-18 07:10:32 UTC (rev 3363)
+++ liboggz/trunk/src/liboggz/oggz_read.c	2008-01-21 01:27:10 UTC (rev 3364)
@@ -521,14 +521,14 @@
       }
 
       /* identify stream type */
-      oggz_auto_identify(oggz, &og, serialno);
+      oggz_auto_identify_page (oggz, &og, serialno);
     }
     else if (oggz_stream_get_content(oggz, serialno) == OGGZ_CONTENT_ANXDATA)
     {
       /*
        * re-identify ANXDATA streams as these are now content streams
        */
-      oggz_auto_identify(oggz, &og, serialno);
+      oggz_auto_identify_page (oggz, &og, serialno);
     }
     
     os = &stream->ogg_stream;