From 47cbb230e9f0d5d0e5aea219feffd9772c920ccf Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 30 Nov 2011 07:57:02 +0100 Subject: [PATCH] audio: move audio interfaces Move the audio related interfaces to the audio library. --- docs/libs/gst-plugins-base-libs-sections.txt | 8 ++++---- docs/libs/gst-plugins-base-libs.types | 4 ++-- ext/alsa/gstalsamixer.h | 2 +- ext/alsa/gstalsamixeroptions.h | 2 +- ext/alsa/gstalsamixertrack.h | 2 +- gst-libs/gst/audio/Makefile.am | 13 +++++++++++-- gst-libs/gst/audio/audio-marshal.list | 2 ++ gst-libs/gst/{interfaces => audio}/mixer.c | 2 +- gst-libs/gst/{interfaces => audio}/mixer.h | 5 ++--- gst-libs/gst/{interfaces => audio}/mixeroptions.c | 0 gst-libs/gst/{interfaces => audio}/mixeroptions.h | 2 +- gst-libs/gst/{interfaces => audio}/mixertrack.c | 0 gst-libs/gst/{interfaces => audio}/mixertrack.h | 0 gst-libs/gst/audio/mixerutils.h | 2 +- gst-libs/gst/{interfaces => audio}/streamvolume.c | 0 gst-libs/gst/{interfaces => audio}/streamvolume.h | 0 gst-libs/gst/interfaces/Makefile.am | 8 -------- gst-libs/gst/interfaces/interfaces-marshal.list | 3 --- gst/playback/Makefile.am | 2 +- gst/playback/gstplaybin2.c | 2 +- gst/volume/gstvolume.c | 3 +-- gst/volume/gstvolume.h | 2 +- 22 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 gst-libs/gst/audio/audio-marshal.list rename gst-libs/gst/{interfaces => audio}/mixer.c (99%) rename gst-libs/gst/{interfaces => audio}/mixer.h (98%) rename gst-libs/gst/{interfaces => audio}/mixeroptions.c (100%) rename gst-libs/gst/{interfaces => audio}/mixeroptions.h (98%) rename gst-libs/gst/{interfaces => audio}/mixertrack.c (100%) rename gst-libs/gst/{interfaces => audio}/mixertrack.h (100%) rename gst-libs/gst/{interfaces => audio}/streamvolume.c (100%) rename gst-libs/gst/{interfaces => audio}/streamvolume.h (100%) diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index 425b7c5c44..7d82476486 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -601,7 +601,7 @@ gst_color_balance_channel_get_type
gstmixer -gst/interfaces/mixer.h +gst/audio/mixer.h GstMixer GstMixerType GstMixerFlags @@ -654,7 +654,7 @@ gst_stream_volume_format_get_type
gstmixeroptions -gst/interfaces/mixer.h +gst/audio/mixer.h GstMixerOptions gst_mixer_options_get_values @@ -670,7 +670,7 @@ gst_mixer_options_get_type
gstmixertrack -gst/interfaces/mixer.h +gst/audio/mixer.h GstMixerTrack GstMixerTrackFlags GST_MIXER_TRACK_HAS_FLAG @@ -772,7 +772,7 @@ gst_property_probe_get_type
gststreamvolume -gst/interfaces/streamvolume.h +gst/audio/streamvolume.h GstStreamVolume GstStreamVolumeFormat diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types index 04ac2b7060..7f67c36e2c 100644 --- a/docs/libs/gst-plugins-base-libs.types +++ b/docs/libs/gst-plugins-base-libs.types @@ -22,7 +22,7 @@ gst_audio_base_src_get_type #include gst_audio_ring_buffer_get_type -#include +#include gst_mixer_get_type gst_mixer_options_get_type gst_mixer_track_get_type @@ -34,7 +34,7 @@ gst_property_probe_get_type gst_tuner_get_type gst_tuner_channel_get_type gst_tuner_norm_get_type -#include +#include gst_stream_volume_get_type diff --git a/ext/alsa/gstalsamixer.h b/ext/alsa/gstalsamixer.h index ba99f72851..03118f129c 100644 --- a/ext/alsa/gstalsamixer.h +++ b/ext/alsa/gstalsamixer.h @@ -23,7 +23,7 @@ #include "gstalsa.h" -#include +#include #include "gstalsamixeroptions.h" #include "gstalsamixertrack.h" diff --git a/ext/alsa/gstalsamixeroptions.h b/ext/alsa/gstalsamixeroptions.h index b3c36c0d45..7336657366 100644 --- a/ext/alsa/gstalsamixeroptions.h +++ b/ext/alsa/gstalsamixeroptions.h @@ -22,7 +22,7 @@ #include "gstalsa.h" -#include +#include G_BEGIN_DECLS diff --git a/ext/alsa/gstalsamixertrack.h b/ext/alsa/gstalsamixertrack.h index acc64cb3f1..b5fbef2a95 100644 --- a/ext/alsa/gstalsamixertrack.h +++ b/ext/alsa/gstalsamixertrack.h @@ -22,7 +22,7 @@ #include "gstalsa.h" -#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index f49d4059f4..4e702ae1ed 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -7,8 +7,8 @@ glib_enum_define = GST_AUDIO glib_gen_prefix = gst_audio glib_gen_basename = audio -built_sources = audio-enumtypes.c -built_headers = audio-enumtypes.h +built_sources = audio-enumtypes.c audio-marshal.c +built_headers = audio-enumtypes.h audio-marshal.h BUILT_SOURCES = $(built_sources) $(built_headers) lib_LTLIBRARIES = \ @@ -21,6 +21,9 @@ libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \ audio.c \ gstaudioringbuffer.c \ gstaudioclock.c \ + mixer.c \ + mixeroptions.c \ + mixertrack.c \ mixerutils.c \ multichannel.c \ gstaudiocdsrc.c \ @@ -31,7 +34,9 @@ libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \ gstaudiofilter.c \ gstaudiosink.c \ gstaudiosrc.c \ + streamvolume.c \ gstaudioiec61937.c + nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES = $(built_sources) $(built_headers) libgstaudio_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio @@ -47,8 +52,12 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ gstaudiobasesrc.h \ gstaudiosink.h \ gstaudiosrc.h \ + mixer.h \ + mixeroptions.h \ + mixertrack.h \ mixerutils.h \ multichannel.h \ + streamvolume.h \ gstaudioiec61937.h nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ diff --git a/gst-libs/gst/audio/audio-marshal.list b/gst-libs/gst/audio/audio-marshal.list new file mode 100644 index 0000000000..c99ddc7d2b --- /dev/null +++ b/gst-libs/gst/audio/audio-marshal.list @@ -0,0 +1,2 @@ +VOID:OBJECT,ULONG +VOID:OBJECT,INT diff --git a/gst-libs/gst/interfaces/mixer.c b/gst-libs/gst/audio/mixer.c similarity index 99% rename from gst-libs/gst/interfaces/mixer.c rename to gst-libs/gst/audio/mixer.c index 506e71134c..0fca9a83f5 100644 --- a/gst-libs/gst/interfaces/mixer.c +++ b/gst-libs/gst/audio/mixer.c @@ -24,7 +24,7 @@ #endif #include "mixer.h" -#include "interfaces-marshal.h" +#include "audio-marshal.h" #define GST_MIXER_MESSAGE_NAME "gst-mixer-message" diff --git a/gst-libs/gst/interfaces/mixer.h b/gst-libs/gst/audio/mixer.h similarity index 98% rename from gst-libs/gst/interfaces/mixer.h rename to gst-libs/gst/audio/mixer.h index 96bdccbafa..2cb618bbfa 100644 --- a/gst-libs/gst/interfaces/mixer.h +++ b/gst-libs/gst/audio/mixer.h @@ -23,9 +23,8 @@ #define __GST_MIXER_H__ #include -#include -#include -#include +#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/interfaces/mixeroptions.c b/gst-libs/gst/audio/mixeroptions.c similarity index 100% rename from gst-libs/gst/interfaces/mixeroptions.c rename to gst-libs/gst/audio/mixeroptions.c diff --git a/gst-libs/gst/interfaces/mixeroptions.h b/gst-libs/gst/audio/mixeroptions.h similarity index 98% rename from gst-libs/gst/interfaces/mixeroptions.h rename to gst-libs/gst/audio/mixeroptions.h index d8b78c486e..bbb55a7940 100644 --- a/gst-libs/gst/interfaces/mixeroptions.h +++ b/gst-libs/gst/audio/mixeroptions.h @@ -25,7 +25,7 @@ #define __GST_MIXER_OPTIONS_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/interfaces/mixertrack.c b/gst-libs/gst/audio/mixertrack.c similarity index 100% rename from gst-libs/gst/interfaces/mixertrack.c rename to gst-libs/gst/audio/mixertrack.c diff --git a/gst-libs/gst/interfaces/mixertrack.h b/gst-libs/gst/audio/mixertrack.h similarity index 100% rename from gst-libs/gst/interfaces/mixertrack.h rename to gst-libs/gst/audio/mixertrack.h diff --git a/gst-libs/gst/audio/mixerutils.h b/gst-libs/gst/audio/mixerutils.h index cfda7ab7ce..0635dc58cb 100644 --- a/gst-libs/gst/audio/mixerutils.h +++ b/gst-libs/gst/audio/mixerutils.h @@ -21,7 +21,7 @@ #define __GST_AUDIO_MIXERUTILS_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/gst-libs/gst/interfaces/streamvolume.c b/gst-libs/gst/audio/streamvolume.c similarity index 100% rename from gst-libs/gst/interfaces/streamvolume.c rename to gst-libs/gst/audio/streamvolume.c diff --git a/gst-libs/gst/interfaces/streamvolume.h b/gst-libs/gst/audio/streamvolume.h similarity index 100% rename from gst-libs/gst/interfaces/streamvolume.h rename to gst-libs/gst/audio/streamvolume.h diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am index 4e0f2b9d0e..8eae7e3a5b 100644 --- a/gst-libs/gst/interfaces/Makefile.am +++ b/gst-libs/gst/interfaces/Makefile.am @@ -3,12 +3,8 @@ libgstinterfacesincludedir = \ $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces headers_interfaces = \ - mixer.h \ - mixeroptions.h \ - mixertrack.h \ navigation.h \ propertyprobe.h \ - streamvolume.h \ tuner.h \ tunernorm.h \ tunerchannel.h @@ -34,12 +30,8 @@ nodist_libgstinterfacesinclude_HEADERS = \ interfaces-enumtypes.h libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ - mixer.c \ - mixeroptions.c \ - mixertrack.c \ navigation.c \ propertyprobe.c \ - streamvolume.c \ tuner.c \ tunernorm.c \ tunerchannel.c diff --git a/gst-libs/gst/interfaces/interfaces-marshal.list b/gst-libs/gst/interfaces/interfaces-marshal.list index cb7469c2d3..c99ddc7d2b 100644 --- a/gst-libs/gst/interfaces/interfaces-marshal.list +++ b/gst-libs/gst/interfaces/interfaces-marshal.list @@ -1,5 +1,2 @@ -VOID:OBJECT,BOOLEAN -VOID:OBJECT,POINTER -VOID:OBJECT,STRING VOID:OBJECT,ULONG VOID:OBJECT,INT diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am index 40e66620f1..a347d0dc69 100644 --- a/gst/playback/Makefile.am +++ b/gst/playback/Makefile.am @@ -28,7 +28,7 @@ libgstplayback_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags libgstplayback_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstplayback_la_LIBADD = \ $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ - $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \ + $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \ $(GST_LIBS) libgstplayback_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/playback/gstplaybin2.c b/gst/playback/gstplaybin2.c index dcdcb02ac1..b99c28c465 100644 --- a/gst/playback/gstplaybin2.c +++ b/gst/playback/gstplaybin2.c @@ -222,7 +222,7 @@ #include #include -#include +#include #include "gstplay-enum.h" #include "gstplay-marshal.h" diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c index 52b01a8967..00760bfa65 100644 --- a/gst/volume/gstvolume.c +++ b/gst/volume/gstvolume.c @@ -45,8 +45,7 @@ #include #include #include -#include -#include +#include #include #ifdef HAVE_ORC diff --git a/gst/volume/gstvolume.h b/gst/volume/gstvolume.h index 047227dd41..86fe2b6c17 100644 --- a/gst/volume/gstvolume.h +++ b/gst/volume/gstvolume.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include