audio: move audio interfaces

Move the audio related interfaces to the audio library.

diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt
index 425b7c5..7d82476 100644 (file)
--- 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
 
 <SECTION>
 <FILE>gstmixer</FILE>
-<INCLUDE>gst/interfaces/mixer.h</INCLUDE>
+<INCLUDE>gst/audio/mixer.h</INCLUDE>
 GstMixer
 GstMixerType
 GstMixerFlags
@@ -654,7 +654,7 @@ gst_stream_volume_format_get_type
 
 <SECTION>
 <FILE>gstmixeroptions</FILE>
-<INCLUDE>gst/interfaces/mixer.h</INCLUDE>
+<INCLUDE>gst/audio/mixer.h</INCLUDE>
 GstMixerOptions
 gst_mixer_options_get_values
 <SUBSECTION Standard>
@@ -670,7 +670,7 @@ gst_mixer_options_get_type
 
 <SECTION>
 <FILE>gstmixertrack</FILE>
-<INCLUDE>gst/interfaces/mixer.h</INCLUDE>
+<INCLUDE>gst/audio/mixer.h</INCLUDE>
 GstMixerTrack
 GstMixerTrackFlags
 GST_MIXER_TRACK_HAS_FLAG
@@ -772,7 +772,7 @@ gst_property_probe_get_type
 
 <SECTION>
 <FILE>gststreamvolume</FILE>
-<INCLUDE>gst/interfaces/streamvolume.h</INCLUDE>
+<INCLUDE>gst/audio/streamvolume.h</INCLUDE>
 GstStreamVolume
 GstStreamVolumeFormat
 

diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types
index 04ac2b7..7f67c36 100644 (file)
--- 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/gstaudioringbuffer.h>
 gst_audio_ring_buffer_get_type
 
-#include <gst/interfaces/mixer.h>
+#include <gst/audio/mixer.h>
 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 <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
 gst_stream_volume_get_type
 
 

diff --git a/ext/alsa/gstalsamixer.h b/ext/alsa/gstalsamixer.h
index ba99f72..03118f1 100644 (file)
--- a/ext/alsa/gstalsamixer.h
+++ b/ext/alsa/gstalsamixer.h
@@ -23,7 +23,7 @@
 
 #include "gstalsa.h"
 
-#include <gst/interfaces/mixer.h>
+#include <gst/audio/mixer.h>
 #include "gstalsamixeroptions.h"
 #include "gstalsamixertrack.h"
 

diff --git a/ext/alsa/gstalsamixeroptions.h b/ext/alsa/gstalsamixeroptions.h
index b3c36c0..7336657 100644 (file)
--- a/ext/alsa/gstalsamixeroptions.h
+++ b/ext/alsa/gstalsamixeroptions.h
@@ -22,7 +22,7 @@
 
 
 #include "gstalsa.h"
-#include <gst/interfaces/mixeroptions.h>
+#include <gst/audio/mixeroptions.h>
 
 
 G_BEGIN_DECLS

diff --git a/ext/alsa/gstalsamixertrack.h b/ext/alsa/gstalsamixertrack.h
index acc64cb..b5fbef2 100644 (file)
--- a/ext/alsa/gstalsamixertrack.h
+++ b/ext/alsa/gstalsamixertrack.h
@@ -22,7 +22,7 @@
 
 
 #include "gstalsa.h"
-#include <gst/interfaces/mixertrack.h>
+#include <gst/audio/mixertrack.h>
 
 
 G_BEGIN_DECLS

diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index f49d405..4e702ae 100644 (file)
--- 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 (file)
index 0000000..c99ddc7
--- /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 506e711..0fca9a8 100644 (file)
--- 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 96bdccb..2cb618b 100644 (file)
--- a/gst-libs/gst/interfaces/mixer.h
+++ b/gst-libs/gst/audio/mixer.h
@@ -23,9 +23,8 @@
 #define __GST_MIXER_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/mixeroptions.h>
-#include <gst/interfaces/mixertrack.h>
-#include <gst/interfaces/interfaces-enumtypes.h>
+#include <gst/audio/mixeroptions.h>
+#include <gst/audio/mixertrack.h>
 
 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 d8b78c4..bbb55a7 100644 (file)
--- a/gst-libs/gst/interfaces/mixeroptions.h
+++ b/gst-libs/gst/audio/mixeroptions.h
@@ -25,7 +25,7 @@
 #define __GST_MIXER_OPTIONS_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/mixertrack.h>
+#include <gst/audio/mixertrack.h>
 
 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 cfda7ab..0635dc5 100644 (file)
--- a/gst-libs/gst/audio/mixerutils.h
+++ b/gst-libs/gst/audio/mixerutils.h
@@ -21,7 +21,7 @@
 #define __GST_AUDIO_MIXERUTILS_H__
 
 #include <gst/gst.h>
-#include <gst/interfaces/mixer.h>
+#include <gst/audio/mixer.h>
 
 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 4e0f2b9..8eae7e3 100644 (file)
--- 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 cb7469c..c99ddc7 100644 (file)
--- 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 40e6662..a347d0d 100644 (file)
--- 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 dcdcb02..b99c28c 100644 (file)
--- a/gst/playback/gstplaybin2.c
+++ b/gst/playback/gstplaybin2.c
@@ -222,7 +222,7 @@
 
 #include <gst/gst-i18n-plugin.h>
 #include <gst/pbutils/pbutils.h>
-#include <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
 
 #include "gstplay-enum.h"
 #include "gstplay-marshal.h"

diff --git a/gst/volume/gstvolume.c b/gst/volume/gstvolume.c
index 52b01a8..00760bf 100644 (file)
--- a/gst/volume/gstvolume.c
+++ b/gst/volume/gstvolume.c
@@ -45,8 +45,7 @@
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
 #include <gst/audio/audio.h>
-#include <gst/interfaces/mixer.h>
-#include <gst/audio/audio.h>
+#include <gst/audio/mixer.h>
 #include <gst/audio/gstaudiofilter.h>
 
 #ifdef HAVE_ORC

diff --git a/gst/volume/gstvolume.h b/gst/volume/gstvolume.h
index 047227d..86fe2b6 100644 (file)
--- a/gst/volume/gstvolume.h
+++ b/gst/volume/gstvolume.h
@@ -26,7 +26,7 @@
 
 #include <gst/gst.h>
 #include <gst/base/gstbasetransform.h>
-#include <gst/interfaces/streamvolume.h>
+#include <gst/audio/streamvolume.h>
 #include <gst/audio/audio.h>
 #include <gst/audio/gstaudiofilter.h>