[xiph-commits] r16788 - trunk/vorbis/include/vorbis

[giles at svn.xiph.org]

Author: giles
Date: 2010-01-19 17:36:04 -0800 (Tue, 19 Jan 2010)
New Revision: 16788

Modified:
   trunk/vorbis/include/vorbis/vorbisenc.h
Log:
Shift vorbisenc API docs into doxygen 1/2 (reorder defines)

In order to group the documentation of the OV_ECTL_* constants used
with vorbis_encode_ctl, their definitions need to be adjacent.

This patch only moves the defines; the next only touches comments.

Patch from Douglas Bagnall <douglas at paradise.net.nz>.


Modified: trunk/vorbis/include/vorbis/vorbisenc.h
===================================================================
--- trunk/vorbis/include/vorbis/vorbisenc.h	2010-01-15 04:13:36 UTC (rev 16787)
+++ trunk/vorbis/include/vorbis/vorbisenc.h	2010-01-20 01:36:04 UTC (rev 16788)
@@ -59,12 +59,6 @@
 
 extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg);
 
-  /* deprecated rate management supported only for compatability */
-#define OV_ECTL_RATEMANAGE_GET       0x10
-#define OV_ECTL_RATEMANAGE_SET       0x11
-#define OV_ECTL_RATEMANAGE_AVG       0x12
-#define OV_ECTL_RATEMANAGE_HARD      0x13
-
 struct ovectl_ratemanage_arg {
   int    management_active;
 
@@ -78,11 +72,6 @@
   double bitrate_av_window_center;
 };
 
-
-  /* new rate setup */
-#define OV_ECTL_RATEMANAGE2_GET      0x14
-#define OV_ECTL_RATEMANAGE2_SET      0x15
-
 struct ovectl_ratemanage2_arg {
   int    management_active;
 
@@ -96,6 +85,9 @@
 };
 
 
+  /* new rate setup */
+#define OV_ECTL_RATEMANAGE2_GET      0x14
+#define OV_ECTL_RATEMANAGE2_SET      0x15
 
 #define OV_ECTL_LOWPASS_GET          0x20
 #define OV_ECTL_LOWPASS_SET          0x21
@@ -103,6 +95,12 @@
 #define OV_ECTL_IBLOCK_GET           0x30
 #define OV_ECTL_IBLOCK_SET           0x31
 
+  /* deprecated rate management supported only for compatability */
+#define OV_ECTL_RATEMANAGE_GET       0x10
+#define OV_ECTL_RATEMANAGE_SET       0x11
+#define OV_ECTL_RATEMANAGE_AVG       0x12
+#define OV_ECTL_RATEMANAGE_HARD      0x13
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */