From e2fcc71650b9cac604704f29143fa744f39cb299 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Wed, 31 Dec 2008 11:20:26 +0000 Subject: [PATCH] Switch glib-mkenum for gst-libs/gst/audio from multichannel- to audio- in order to wrap all enums declarations of tha... Original commit message from CVS: * gst-libs/gst/audio/Makefile.am: * gst-libs/gst/audio/audio.c: * gst-libs/gst/audio/multichannel.h: * gst-libs/gst/audio/testchannels.c: * win32/MANIFEST: * win32/common/audio-enumtypes.c: (gst_audio_channel_position_get_type), (gst_ring_buffer_state_get_type), (gst_ring_buffer_seg_state_get_type), (gst_buffer_format_type_get_type), (gst_buffer_format_get_type): * win32/common/audio-enumtypes.h: * win32/common/multichannel-enumtypes.c: * win32/common/multichannel-enumtypes.h: * win32/vs6/grammar.dsp: * win32/vs6/libgstaudio.dsp: * win32/vs7/libgstaudio.vcproj: * win32/vs8/libgstaudio.vcproj: Switch glib-mkenum for gst-libs/gst/audio from multichannel- to audio- in order to wrap all enums declarations of that library. This modification should not matter since that header file is not a public header (it will be included by public headers). Modify win32 crap^Wfiles accordingly. --- ChangeLog | 25 +++++ gst-libs/gst/audio/Makefile.am | 11 +- gst-libs/gst/audio/audio.c | 2 +- gst-libs/gst/audio/multichannel.h | 2 +- gst-libs/gst/audio/testchannels.c | 2 +- win32/MANIFEST | 4 +- win32/common/audio-enumtypes.c | 166 ++++++++++++++++++++++++++++++ win32/common/audio-enumtypes.h | 29 ++++++ win32/vs6/grammar.dsp | 22 ++-- win32/vs6/libgstaudio.dsp | 4 +- win32/vs7/libgstaudio.vcproj | 10 +- win32/vs8/libgstaudio.vcproj | 6 +- 12 files changed, 253 insertions(+), 30 deletions(-) create mode 100644 win32/common/audio-enumtypes.c create mode 100644 win32/common/audio-enumtypes.h diff --git a/ChangeLog b/ChangeLog index 0dccf2361b..d4fa6079ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2008-12-31 Edward Hervey + + * gst-libs/gst/audio/Makefile.am: + * gst-libs/gst/audio/audio.c: + * gst-libs/gst/audio/multichannel.h: + * gst-libs/gst/audio/testchannels.c: + * win32/MANIFEST: + * win32/common/audio-enumtypes.c: + (gst_audio_channel_position_get_type), + (gst_ring_buffer_state_get_type), + (gst_ring_buffer_seg_state_get_type), + (gst_buffer_format_type_get_type), (gst_buffer_format_get_type): + * win32/common/audio-enumtypes.h: + * win32/common/multichannel-enumtypes.c: + * win32/common/multichannel-enumtypes.h: + * win32/vs6/grammar.dsp: + * win32/vs6/libgstaudio.dsp: + * win32/vs7/libgstaudio.vcproj: + * win32/vs8/libgstaudio.vcproj: + Switch glib-mkenum for gst-libs/gst/audio from multichannel- to + audio- in order to wrap all enums declarations of that library. + This modification should not matter since that header file is not a + public header (it will be included by public headers). + Modify win32 crap^Wfiles accordingly. + 2008-12-30 Edward Hervey * gst-libs/gst/audio/gstbaseaudiosrc.h: diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index de038d4550..904090dc2d 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -1,10 +1,13 @@ # variables used for enum/marshal generation -glib_enum_headers=multichannel.h +glib_enum_headers= \ + multichannel.h \ + gstringbuffer.h + glib_enum_define=GST_AUDIO glib_enum_prefix=gst_audio -built_sources = multichannel-enumtypes.c -built_headers = multichannel-enumtypes.h +built_sources = audio-enumtypes.c +built_headers = audio-enumtypes.h BUILT_SOURCES = $(built_sources) $(built_headers) lib_LTLIBRARIES = \ @@ -39,7 +42,7 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ multichannel.h nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ - multichannel-enumtypes.h + audio-enumtypes.h libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \ diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index 03d14d5b94..5501706531 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -22,7 +22,7 @@ #endif #include "audio.h" -#include "multichannel-enumtypes.h" +#include "audio-enumtypes.h" #include diff --git a/gst-libs/gst/audio/multichannel.h b/gst-libs/gst/audio/multichannel.h index 8542eb229d..75dbf29bc9 100644 --- a/gst-libs/gst/audio/multichannel.h +++ b/gst-libs/gst/audio/multichannel.h @@ -21,7 +21,7 @@ #define __GST_AUDIO_MULTICHANNEL_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/audio/testchannels.c b/gst-libs/gst/audio/testchannels.c index 75dd13c3da..fa07297991 100644 --- a/gst-libs/gst/audio/testchannels.c +++ b/gst-libs/gst/audio/testchannels.c @@ -24,7 +24,7 @@ #include #include -#include +#include gint main (gint argc, gchar * argv[]) diff --git a/win32/MANIFEST b/win32/MANIFEST index 6d77a0fd55..57222377c0 100644 --- a/win32/MANIFEST +++ b/win32/MANIFEST @@ -17,8 +17,8 @@ win32/common/libgstrtsp.def win32/common/libgstsdp.def win32/common/libgsttag.def win32/common/libgstvideo.def -win32/common/multichannel-enumtypes.c -win32/common/multichannel-enumtypes.h +win32/common/audio-enumtypes.c +win32/common/audio-enumtypes.h win32/common/pbutils-enumtypes.c win32/common/pbutils-enumtypes.h win32/vs6/gst_plugins_base.dsw diff --git a/win32/common/audio-enumtypes.c b/win32/common/audio-enumtypes.c new file mode 100644 index 0000000000..ef9b3ec7d3 --- /dev/null +++ b/win32/common/audio-enumtypes.c @@ -0,0 +1,166 @@ + +/* Generated data (by glib-mkenums) */ + +#include "audio-enumtypes.h" + +#include "multichannel.h" +#include "gstringbuffer.h" + +/* enumerations from "multichannel.h" */ +GType +gst_audio_channel_position_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_AUDIO_CHANNEL_POSITION_INVALID, "GST_AUDIO_CHANNEL_POSITION_INVALID", + "invalid"}, + {GST_AUDIO_CHANNEL_POSITION_FRONT_MONO, + "GST_AUDIO_CHANNEL_POSITION_FRONT_MONO", "front-mono"}, + {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT, + "GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT", "front-left"}, + {GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT, + "GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT", "front-right"}, + {GST_AUDIO_CHANNEL_POSITION_REAR_CENTER, + "GST_AUDIO_CHANNEL_POSITION_REAR_CENTER", "rear-center"}, + {GST_AUDIO_CHANNEL_POSITION_REAR_LEFT, + "GST_AUDIO_CHANNEL_POSITION_REAR_LEFT", "rear-left"}, + {GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT, + "GST_AUDIO_CHANNEL_POSITION_REAR_RIGHT", "rear-right"}, + {GST_AUDIO_CHANNEL_POSITION_LFE, "GST_AUDIO_CHANNEL_POSITION_LFE", "lfe"}, + {GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER, + "GST_AUDIO_CHANNEL_POSITION_FRONT_CENTER", "front-center"}, + {GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER, + "GST_AUDIO_CHANNEL_POSITION_FRONT_LEFT_OF_CENTER", + "front-left-of-center"}, + {GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER, + "GST_AUDIO_CHANNEL_POSITION_FRONT_RIGHT_OF_CENTER", + "front-right-of-center"}, + {GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT, + "GST_AUDIO_CHANNEL_POSITION_SIDE_LEFT", "side-left"}, + {GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT, + "GST_AUDIO_CHANNEL_POSITION_SIDE_RIGHT", "side-right"}, + {GST_AUDIO_CHANNEL_POSITION_NONE, "GST_AUDIO_CHANNEL_POSITION_NONE", + "none"}, + {GST_AUDIO_CHANNEL_POSITION_NUM, "GST_AUDIO_CHANNEL_POSITION_NUM", "num"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstAudioChannelPosition", values); + } + return etype; +} + +/* enumerations from "gstringbuffer.h" */ +GType +gst_ring_buffer_state_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_RING_BUFFER_STATE_STOPPED, "GST_RING_BUFFER_STATE_STOPPED", + "stopped"}, + {GST_RING_BUFFER_STATE_PAUSED, "GST_RING_BUFFER_STATE_PAUSED", "paused"}, + {GST_RING_BUFFER_STATE_STARTED, "GST_RING_BUFFER_STATE_STARTED", + "started"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstRingBufferState", values); + } + return etype; +} + +GType +gst_ring_buffer_seg_state_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_SEGSTATE_INVALID, "GST_SEGSTATE_INVALID", "invalid"}, + {GST_SEGSTATE_EMPTY, "GST_SEGSTATE_EMPTY", "empty"}, + {GST_SEGSTATE_FILLED, "GST_SEGSTATE_FILLED", "filled"}, + {GST_SEGSTATE_PARTIAL, "GST_SEGSTATE_PARTIAL", "partial"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstRingBufferSegState", values); + } + return etype; +} + +GType +gst_buffer_format_type_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_BUFTYPE_LINEAR, "GST_BUFTYPE_LINEAR", "linear"}, + {GST_BUFTYPE_FLOAT, "GST_BUFTYPE_FLOAT", "float"}, + {GST_BUFTYPE_MU_LAW, "GST_BUFTYPE_MU_LAW", "mu-law"}, + {GST_BUFTYPE_A_LAW, "GST_BUFTYPE_A_LAW", "a-law"}, + {GST_BUFTYPE_IMA_ADPCM, "GST_BUFTYPE_IMA_ADPCM", "ima-adpcm"}, + {GST_BUFTYPE_MPEG, "GST_BUFTYPE_MPEG", "mpeg"}, + {GST_BUFTYPE_GSM, "GST_BUFTYPE_GSM", "gsm"}, + {GST_BUFTYPE_IEC958, "GST_BUFTYPE_IEC958", "iec958"}, + {GST_BUFTYPE_AC3, "GST_BUFTYPE_AC3", "ac3"}, + {GST_BUFTYPE_EAC3, "GST_BUFTYPE_EAC3", "eac3"}, + {GST_BUFTYPE_DTS, "GST_BUFTYPE_DTS", "dts"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstBufferFormatType", values); + } + return etype; +} + +GType +gst_buffer_format_get_type (void) +{ + static GType etype = 0; + if (etype == 0) { + static const GEnumValue values[] = { + {GST_UNKNOWN, "GST_UNKNOWN", "unknown"}, + {GST_S8, "GST_S8", "s8"}, + {GST_U8, "GST_U8", "u8"}, + {GST_S16_LE, "GST_S16_LE", "s16-le"}, + {GST_S16_BE, "GST_S16_BE", "s16-be"}, + {GST_U16_LE, "GST_U16_LE", "u16-le"}, + {GST_U16_BE, "GST_U16_BE", "u16-be"}, + {GST_S24_LE, "GST_S24_LE", "s24-le"}, + {GST_S24_BE, "GST_S24_BE", "s24-be"}, + {GST_U24_LE, "GST_U24_LE", "u24-le"}, + {GST_U24_BE, "GST_U24_BE", "u24-be"}, + {GST_S32_LE, "GST_S32_LE", "s32-le"}, + {GST_S32_BE, "GST_S32_BE", "s32-be"}, + {GST_U32_LE, "GST_U32_LE", "u32-le"}, + {GST_U32_BE, "GST_U32_BE", "u32-be"}, + {GST_S24_3LE, "GST_S24_3LE", "s24-3le"}, + {GST_S24_3BE, "GST_S24_3BE", "s24-3be"}, + {GST_U24_3LE, "GST_U24_3LE", "u24-3le"}, + {GST_U24_3BE, "GST_U24_3BE", "u24-3be"}, + {GST_S20_3LE, "GST_S20_3LE", "s20-3le"}, + {GST_S20_3BE, "GST_S20_3BE", "s20-3be"}, + {GST_U20_3LE, "GST_U20_3LE", "u20-3le"}, + {GST_U20_3BE, "GST_U20_3BE", "u20-3be"}, + {GST_S18_3LE, "GST_S18_3LE", "s18-3le"}, + {GST_S18_3BE, "GST_S18_3BE", "s18-3be"}, + {GST_U18_3LE, "GST_U18_3LE", "u18-3le"}, + {GST_U18_3BE, "GST_U18_3BE", "u18-3be"}, + {GST_FLOAT32_LE, "GST_FLOAT32_LE", "float32-le"}, + {GST_FLOAT32_BE, "GST_FLOAT32_BE", "float32-be"}, + {GST_FLOAT64_LE, "GST_FLOAT64_LE", "float64-le"}, + {GST_FLOAT64_BE, "GST_FLOAT64_BE", "float64-be"}, + {GST_MU_LAW, "GST_MU_LAW", "mu-law"}, + {GST_A_LAW, "GST_A_LAW", "a-law"}, + {GST_IMA_ADPCM, "GST_IMA_ADPCM", "ima-adpcm"}, + {GST_MPEG, "GST_MPEG", "mpeg"}, + {GST_GSM, "GST_GSM", "gsm"}, + {GST_IEC958, "GST_IEC958", "iec958"}, + {GST_AC3, "GST_AC3", "ac3"}, + {GST_EAC3, "GST_EAC3", "eac3"}, + {GST_DTS, "GST_DTS", "dts"}, + {0, NULL, NULL} + }; + etype = g_enum_register_static ("GstBufferFormat", values); + } + return etype; +} + +/* Generated data ends here */ diff --git a/win32/common/audio-enumtypes.h b/win32/common/audio-enumtypes.h new file mode 100644 index 0000000000..b3d1558169 --- /dev/null +++ b/win32/common/audio-enumtypes.h @@ -0,0 +1,29 @@ + +/* Generated data (by glib-mkenums) */ + +#ifndef __GST_AUDIO_ENUM_TYPES_H__ +#define __GST_AUDIO_ENUM_TYPES_H__ + +#include + +G_BEGIN_DECLS + +/* enumerations from "multichannel.h" */ +GType gst_audio_channel_position_get_type (void); +#define GST_TYPE_AUDIO_CHANNEL_POSITION (gst_audio_channel_position_get_type()) + +/* enumerations from "gstringbuffer.h" */ +GType gst_ring_buffer_state_get_type (void); +#define GST_TYPE_RING_BUFFER_STATE (gst_ring_buffer_state_get_type()) +GType gst_ring_buffer_seg_state_get_type (void); +#define GST_TYPE_RING_BUFFER_SEG_STATE (gst_ring_buffer_seg_state_get_type()) +GType gst_buffer_format_type_get_type (void); +#define GST_TYPE_BUFFER_FORMAT_TYPE (gst_buffer_format_type_get_type()) +GType gst_buffer_format_get_type (void); +#define GST_TYPE_BUFFER_FORMAT (gst_buffer_format_get_type()) +G_END_DECLS + +#endif /* __GST_AUDIO_ENUM_TYPES_H__ */ + +/* Generated data ends here */ + diff --git a/win32/vs6/grammar.dsp b/win32/vs6/grammar.dsp index 9e57bf512c..4d67df1db5 100644 --- a/win32/vs6/grammar.dsp +++ b/win32/vs6/grammar.dsp @@ -250,39 +250,39 @@ BuildCmds= \ # End Source File # Begin Source File -SOURCE="..\common\multichannel-enumtypes.c" +SOURCE="..\common\audio-enumtypes.c" !IF "$(CFG)" == "grammar - Win32 Release" # Begin Custom Build -InputPath="..\common\multichannel-enumtypes.c" +InputPath="..\common\audio-enumtypes.c" BuildCmds= \ - copy ..\common\multichannel-enumtypes.h ..\..\gst-libs\gst\audio \ - copy ..\common\multichannel-enumtypes.c ..\..\gst-libs\gst\audio + copy ..\common\audio-enumtypes.h ..\..\gst-libs\gst\audio \ + copy ..\common\audio-enumtypes.c ..\..\gst-libs\gst\audio -"..\..\gst-libs\gst\audio\multichannel-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"..\..\gst-libs\gst\audio\audio-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"..\..\gst-libs\gst\audio\multichannel-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"..\..\gst-libs\gst\audio\audio-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build !ELSEIF "$(CFG)" == "grammar - Win32 Debug" # Begin Custom Build -InputPath="..\common\multichannel-enumtypes.c" +InputPath="..\common\audio-enumtypes.c" BuildCmds= \ - copy ..\common\multichannel-enumtypes.h ..\..\gst-libs\gst\audio \ - copy ..\common\multichannel-enumtypes.c ..\..\gst-libs\gst\audio + copy ..\common\audio-enumtypes.h ..\..\gst-libs\gst\audio \ + copy ..\common\audio-enumtypes.c ..\..\gst-libs\gst\audio -"..\..\gst-libs\gst\audio\multichannel-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"..\..\gst-libs\gst\audio\audio-enumtypes.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) -"..\..\gst-libs\gst\audio\multichannel-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" +"..\..\gst-libs\gst\audio\audio-enumtypes.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" $(BuildCmds) # End Custom Build diff --git a/win32/vs6/libgstaudio.dsp b/win32/vs6/libgstaudio.dsp index 9be05f7ff9..bfd0a8a59b 100644 --- a/win32/vs6/libgstaudio.dsp +++ b/win32/vs6/libgstaudio.dsp @@ -148,7 +148,7 @@ SOURCE="..\..\gst-libs\gst\audio\mixerutils.c" # End Source File # Begin Source File -SOURCE="..\..\gst-libs\gst\audio\multichannel-enumtypes.c" +SOURCE="..\..\gst-libs\gst\audio\audio-enumtypes.c" # End Source File # Begin Source File @@ -192,7 +192,7 @@ SOURCE="..\..\gst-libs\gst\audio\gstringbuffer.h" # End Source File # Begin Source File -SOURCE="..\..\gst-libs\gst\audio\multichannel-enumtypes.h" +SOURCE="..\..\gst-libs\gst\audio\audio-enumtypes.h" # End Source File # Begin Source File diff --git a/win32/vs7/libgstaudio.vcproj b/win32/vs7/libgstaudio.vcproj index b64fea34c5..29e46c735f 100644 --- a/win32/vs7/libgstaudio.vcproj +++ b/win32/vs7/libgstaudio.vcproj @@ -49,8 +49,8 @@ CommandLine="copy /y "$(TargetPath)" c:\gstreamer\debug\bin"/> @@ -104,8 +104,8 @@ copy /y ..\common\multichannel-enumtypes.c ..\..\gst-libs\gst\audio CommandLine="copy /y "$(TargetPath)" c:\gstreamer\bin"/> @@ -161,7 +161,7 @@ copy /y ..\common\multichannel-enumtypes.c ..\..\gst-libs\gst\audio RelativePath="..\common\libgstaudio.def"> + RelativePath="..\..\gst-libs\gst\audio\audio-enumtypes.c"> diff --git a/win32/vs8/libgstaudio.vcproj b/win32/vs8/libgstaudio.vcproj index 023264d9c5..6d320b0246 100644 --- a/win32/vs8/libgstaudio.vcproj +++ b/win32/vs8/libgstaudio.vcproj @@ -23,7 +23,7 @@ >