[cvs-annodex] commit (/annodex): liboggz/trunk/include/oggz/oggz_deprecated.h liboggz/trunk/src/liboggz/Version_script.in liboggz/trunk/src/liboggz/metric_internal.c liboggz/trunk/symbian/liboggz.mmp liboggz/trunk/win32/liboggz.def

[conrad]

Update of /annodex (new revision 838)

Modified files:
   liboggz/trunk/include/oggz/oggz_deprecated.h
   liboggz/trunk/src/liboggz/Version_script.in
   liboggz/trunk/src/liboggz/metric_internal.c
   liboggz/trunk/symbian/liboggz.mmp
   liboggz/trunk/win32/liboggz.def

Log Message:
+ remove unreleased/redundant oggz_set_metriz_zero() function
+ update Version_script and liboggz.def


Modified: liboggz/trunk/include/oggz/oggz_deprecated.h
===================================================================
--- liboggz/trunk/include/oggz/oggz_deprecated.h	2005-02-05 02:03:06 UTC (rev 837)
+++ liboggz/trunk/include/oggz/oggz_deprecated.h	2005-02-05 02:11:43 UTC (rev 838)
@@ -50,6 +50,9 @@
 #define OGGZ_ERR_USER_STOPPED OGGZ_ERR_READ_STOP_OK
 
 /**
+ * DEPRECATED FUNCTION
+ * This function has been replaced with the more clearly named
+ * oggz_set_granulerate().
  * Specify that a logical bitstream has a linear metric
  * \param oggz An OGGZ handle
  * \param serialno Identify the logical bitstream in \a oggz to attach
@@ -66,18 +69,4 @@
 			    ogg_int64_t granule_rate_numerator,
 			    ogg_int64_t granule_rate_denominator);
 
-/**
- * Specify that a logical bitstream has a constant zero metric. This is used
- * for header bitstreams and signifies that all packets are always at unit 0.
- * \param oggz An OGGZ handle
- * \param serialno Identify the logical bitstream in \a oggz to attach
- * this linear metric to. A value of -1 indicates that the metric should
- * be attached to all unattached logical bitstreams in \a oggz.
- * \returns 0 Success
- * \retval OGGZ_ERR_BAD_SERIALNO \a serialno does not identify an existing
- * logical bitstream in \a oggz.
- * \retval OGGZ_ERR_BAD_OGGZ \a oggz does not refer to an existing OGGZ
- */
-int oggz_set_metric_zero (OGGZ * oggz, long serialno);
-
 #endif /* __OGGZ_DEPRECATED_H__ */

Modified: liboggz/trunk/src/liboggz/Version_script.in
===================================================================
--- liboggz/trunk/src/liboggz/Version_script.in	2005-02-05 02:03:06 UTC (rev 837)
+++ liboggz/trunk/src/liboggz/Version_script.in	2005-02-05 02:11:43 UTC (rev 838)
@@ -30,7 +30,10 @@
 
 		oggz_set_metric;
 		oggz_set_metric_linear;
-		oggz_set_metric_granuleshift;
+		oggz_set_granulerate;
+		oggz_get_granulerate;
+		oggz_set_granuleshift;
+		oggz_get_granuleshift;
 
 		oggz_tell;
 		oggz_tell_units;

Modified: liboggz/trunk/src/liboggz/metric_internal.c
===================================================================
--- liboggz/trunk/src/liboggz/metric_internal.c	2005-02-05 02:03:06 UTC (rev 837)
+++ liboggz/trunk/src/liboggz/metric_internal.c	2005-02-05 02:11:43 UTC (rev 838)
@@ -183,9 +183,3 @@
   return oggz_metric_update (oggz, serialno);
 }
 
-int
-oggz_set_metric_zero (OGGZ * oggz, long serialno)
-{
-  return oggz_set_metric_linear (oggz, serialno, 0, 1);
-}
-

Modified: liboggz/trunk/symbian/liboggz.mmp
===================================================================
--- liboggz/trunk/symbian/liboggz.mmp	2005-02-05 02:03:06 UTC (rev 837)
+++ liboggz/trunk/symbian/liboggz.mmp	2005-02-05 02:11:43 UTC (rev 838)
@@ -34,6 +34,6 @@
 TARGETTYPE    lib
 UID           0
 SOURCEPATH    ..\src\liboggz
-SOURCE        oggz.c oggz_auto.c oggz_io.c oggz_read.c oggz_stream.c oggz_table.c oggz_vector.c oggz_write.c
+SOURCE        oggz.c oggz_auto.c oggz_io.c oggz_read.c oggz_stream.c oggz_table.c oggz_vector.c oggz_write.c metric_internal.c
 USERINCLUDE   .
 SYSTEMINCLUDE \epoc32\include \epoc32\include\libc ..\include ..\..\ogg\include ..\..\ogg\symbian

Modified: liboggz/trunk/win32/liboggz.def
===================================================================
--- liboggz/trunk/win32/liboggz.def	2005-02-05 02:03:06 UTC (rev 837)
+++ liboggz/trunk/win32/liboggz.def	2005-02-05 02:11:43 UTC (rev 838)
@@ -25,7 +25,6 @@
 
 oggz_set_metric				@18
 oggz_set_metric_linear		@19
-oggz_set_metric_granuleshift	@50
 
 ;
 ; Ogg file seeking functions
@@ -62,3 +61,11 @@
 oggz_table_lookup			@44
 oggz_table_size				@45
 oggz_table_nth				@46
+
+;
+;oggz stream functions
+;
+oggz_set_granulerate			@50
+oggz_get_granulerate			@51
+oggz_set_granuleshift			@52
+oggz_get_granuleshift			@53
\ No newline at end of file


-- 
conrad