From 757c4783546ff98d4c923b50e47a28a0b14af7fe Mon Sep 17 00:00:00 2001 From: Ralph Giles Date: Wed, 20 Jan 2010 01:36:04 +0000 Subject: [PATCH] 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 . svn path=/trunk/vorbis/; revision=16788 --- include/vorbis/vorbisenc.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/include/vorbis/vorbisenc.h b/include/vorbis/vorbisenc.h index 5af0af0..6948a22 100644 --- a/include/vorbis/vorbisenc.h +++ b/include/vorbis/vorbisenc.h @@ -59,12 +59,6 @@ extern int vorbis_encode_setup_init(vorbis_info *vi); 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 @@ struct ovectl_ratemanage_arg { 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 @@ struct ovectl_ratemanage2_arg { }; + /* 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 @@ struct ovectl_ratemanage2_arg { #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 */ -- 2.7.4