mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

audio: move audio interfaces

Browse source 
Move the audio related interfaces to the audio library.
This commit is contained in:
Wim Taymans 2011-11-30 07:57:02 +01:00
parent 552e825b4f
commit 47cbb230e9
22 changed files with 31 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docs/libs/gst-plugins-base-libs-sections.txt
View file

@ -601,7 +601,7 @@ gst_color_balance_channel_get_type
<SECTION> <SECTION>
<FILE>gstmixer</FILE> <FILE>gstmixer</FILE>
<INCLUDE>gst/interfaces/mixer.h</INCLUDE> <INCLUDE>gst/audio/mixer.h</INCLUDE>
GstMixer GstMixer
GstMixerType GstMixerType
GstMixerFlags GstMixerFlags
@ -654,7 +654,7 @@ gst_stream_volume_format_get_type
<SECTION> <SECTION>
<FILE>gstmixeroptions</FILE> <FILE>gstmixeroptions</FILE>
<INCLUDE>gst/interfaces/mixer.h</INCLUDE> <INCLUDE>gst/audio/mixer.h</INCLUDE>
GstMixerOptions GstMixerOptions
gst_mixer_options_get_values gst_mixer_options_get_values
<SUBSECTION Standard> <SUBSECTION Standard>
@ -670,7 +670,7 @@ gst_mixer_options_get_type
<SECTION> <SECTION>
<FILE>gstmixertrack</FILE> <FILE>gstmixertrack</FILE>
<INCLUDE>gst/interfaces/mixer.h</INCLUDE> <INCLUDE>gst/audio/mixer.h</INCLUDE>
GstMixerTrack GstMixerTrack
GstMixerTrackFlags GstMixerTrackFlags
GST_MIXER_TRACK_HAS_FLAG GST_MIXER_TRACK_HAS_FLAG
@ -772,7 +772,7 @@ gst_property_probe_get_type
<SECTION> <SECTION>
<FILE>gststreamvolume</FILE> <FILE>gststreamvolume</FILE>
<INCLUDE>gst/interfaces/streamvolume.h</INCLUDE> <INCLUDE>gst/audio/streamvolume.h</INCLUDE>
GstStreamVolume GstStreamVolume
GstStreamVolumeFormat GstStreamVolumeFormat

4
docs/libs/gst-plugins-base-libs.types
View file

@ -22,7 +22,7 @@ gst_audio_base_src_get_type
#include <gst/audio/gstaudioringbuffer.h> #include <gst/audio/gstaudioringbuffer.h>
gst_audio_ring_buffer_get_type gst_audio_ring_buffer_get_type
#include <gst/interfaces/mixer.h> #include <gst/audio/mixer.h>
gst_mixer_get_type gst_mixer_get_type
gst_mixer_options_get_type gst_mixer_options_get_type
gst_mixer_track_get_type gst_mixer_track_get_type
@ -34,7 +34,7 @@ gst_property_probe_get_type
gst_tuner_get_type gst_tuner_get_type
gst_tuner_channel_get_type gst_tuner_channel_get_type
gst_tuner_norm_get_type gst_tuner_norm_get_type
#include <gst/interfaces/streamvolume.h> #include <gst/audio/streamvolume.h>
gst_stream_volume_get_type gst_stream_volume_get_type

2
ext/alsa/gstalsamixer.h
View file

@ -23,7 +23,7 @@
#include "gstalsa.h" #include "gstalsa.h"
#include <gst/interfaces/mixer.h> #include <gst/audio/mixer.h>
#include "gstalsamixeroptions.h" #include "gstalsamixeroptions.h"
#include "gstalsamixertrack.h" #include "gstalsamixertrack.h"

2
ext/alsa/gstalsamixeroptions.h
View file

@ -22,7 +22,7 @@
#include "gstalsa.h" #include "gstalsa.h"
#include <gst/interfaces/mixeroptions.h> #include <gst/audio/mixeroptions.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
ext/alsa/gstalsamixertrack.h
View file

@ -22,7 +22,7 @@
#include "gstalsa.h" #include "gstalsa.h"
#include <gst/interfaces/mixertrack.h> #include <gst/audio/mixertrack.h>
G_BEGIN_DECLS G_BEGIN_DECLS

13
gst-libs/gst/audio/Makefile.am
View file

@ -7,8 +7,8 @@ glib_enum_define = GST_AUDIO
glib_gen_prefix = gst_audio glib_gen_prefix = gst_audio
glib_gen_basename = audio glib_gen_basename = audio
built_sources = audio-enumtypes.c built_sources = audio-enumtypes.c audio-marshal.c
built_headers = audio-enumtypes.h built_headers = audio-enumtypes.h audio-marshal.h
BUILT_SOURCES = $(built_sources) $(built_headers) BUILT_SOURCES = $(built_sources) $(built_headers)
lib_LTLIBRARIES = \ lib_LTLIBRARIES = \
@ -21,6 +21,9 @@ libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \
audio.c \ audio.c \
gstaudioringbuffer.c \ gstaudioringbuffer.c \
gstaudioclock.c \ gstaudioclock.c \
mixer.c \
mixeroptions.c \
mixertrack.c \
mixerutils.c \ mixerutils.c \
multichannel.c \ multichannel.c \
gstaudiocdsrc.c \ gstaudiocdsrc.c \
@ -31,7 +34,9 @@ libgstaudio_@GST_MAJORMINOR@_la_SOURCES = \
gstaudiofilter.c \ gstaudiofilter.c \
gstaudiosink.c \ gstaudiosink.c \
gstaudiosrc.c \ gstaudiosrc.c \
streamvolume.c \
gstaudioiec61937.c gstaudioiec61937.c
nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES = $(built_sources) $(built_headers) nodist_libgstaudio_@GST_MAJORMINOR@_la_SOURCES = $(built_sources) $(built_headers)
libgstaudio_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio libgstaudio_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio
@ -47,8 +52,12 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
gstaudiobasesrc.h \ gstaudiobasesrc.h \
gstaudiosink.h \ gstaudiosink.h \
gstaudiosrc.h \ gstaudiosrc.h \
mixer.h \
mixeroptions.h \
mixertrack.h \
mixerutils.h \ mixerutils.h \
multichannel.h \ multichannel.h \
streamvolume.h \
gstaudioiec61937.h gstaudioiec61937.h
nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \ nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \

2
gst-libs/gst/audio/audio-marshal.list Normal file
View file

@ -0,0 +1,2 @@
VOID:OBJECT,ULONG
VOID:OBJECT,INT

2
gst-libs/gst/interfaces/mixer.c → gst-libs/gst/audio/mixer.c
View file

@ -24,7 +24,7 @@
#endif #endif
#include "mixer.h" #include "mixer.h"
#include "interfaces-marshal.h" #include "audio-marshal.h"
#define GST_MIXER_MESSAGE_NAME "gst-mixer-message" #define GST_MIXER_MESSAGE_NAME "gst-mixer-message"

5
gst-libs/gst/interfaces/mixer.h → gst-libs/gst/audio/mixer.h
View file

@ -23,9 +23,8 @@
#define __GST_MIXER_H__ #define __GST_MIXER_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/interfaces/mixeroptions.h> #include <gst/audio/mixeroptions.h>
#include <gst/interfaces/mixertrack.h> #include <gst/audio/mixertrack.h>
#include <gst/interfaces/interfaces-enumtypes.h>
G_BEGIN_DECLS G_BEGIN_DECLS

0
gst-libs/gst/interfaces/mixeroptions.c → gst-libs/gst/audio/mixeroptions.c
View file

2
gst-libs/gst/interfaces/mixeroptions.h → gst-libs/gst/audio/mixeroptions.h
View file

@ -25,7 +25,7 @@
#define __GST_MIXER_OPTIONS_H__ #define __GST_MIXER_OPTIONS_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/interfaces/mixertrack.h> #include <gst/audio/mixertrack.h>
G_BEGIN_DECLS G_BEGIN_DECLS

0
gst-libs/gst/interfaces/mixertrack.c → gst-libs/gst/audio/mixertrack.c
View file

0
gst-libs/gst/interfaces/mixertrack.h → gst-libs/gst/audio/mixertrack.h
View file

2
gst-libs/gst/audio/mixerutils.h
View file

@ -21,7 +21,7 @@
#define __GST_AUDIO_MIXERUTILS_H__ #define __GST_AUDIO_MIXERUTILS_H__
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/interfaces/mixer.h> #include <gst/audio/mixer.h>
G_BEGIN_DECLS G_BEGIN_DECLS

0
gst-libs/gst/interfaces/streamvolume.c → gst-libs/gst/audio/streamvolume.c
View file

0
gst-libs/gst/interfaces/streamvolume.h → gst-libs/gst/audio/streamvolume.h
View file

8
gst-libs/gst/interfaces/Makefile.am
View file

@ -3,12 +3,8 @@ libgstinterfacesincludedir = \
$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/interfaces
headers_interfaces = \ headers_interfaces = \
mixer.h \
mixeroptions.h \
mixertrack.h \
navigation.h \ navigation.h \
propertyprobe.h \ propertyprobe.h \
streamvolume.h \
tuner.h \ tuner.h \
tunernorm.h \ tunernorm.h \
tunerchannel.h tunerchannel.h
@ -34,12 +30,8 @@ nodist_libgstinterfacesinclude_HEADERS = \
interfaces-enumtypes.h interfaces-enumtypes.h
libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \ libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES = \
mixer.c \
mixeroptions.c \
mixertrack.c \
navigation.c \ navigation.c \
propertyprobe.c \ propertyprobe.c \
streamvolume.c \
tuner.c \ tuner.c \
tunernorm.c \ tunernorm.c \
tunerchannel.c tunerchannel.c

3
gst-libs/gst/interfaces/interfaces-marshal.list
View file

@ -1,5 +1,2 @@
VOID:OBJECT,BOOLEAN
VOID:OBJECT,POINTER
VOID:OBJECT,STRING
VOID:OBJECT,ULONG VOID:OBJECT,ULONG
VOID:OBJECT,INT VOID:OBJECT,INT

2
gst/playback/Makefile.am
View file

@ -28,7 +28,7 @@ libgstplayback_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags
libgstplayback_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstplayback_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstplayback_la_LIBADD = \ libgstplayback_la_LIBADD = \
$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \ $(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 \ $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_MAJORMINOR@.la \
$(GST_LIBS) $(GST_LIBS)
libgstplayback_la_LIBTOOLFLAGS = --tag=disable-static libgstplayback_la_LIBTOOLFLAGS = --tag=disable-static

2
gst/playback/gstplaybin2.c
View file

@ -222,7 +222,7 @@
#include <gst/gst-i18n-plugin.h> #include <gst/gst-i18n-plugin.h>
#include <gst/pbutils/pbutils.h> #include <gst/pbutils/pbutils.h>
#include <gst/interfaces/streamvolume.h> #include <gst/audio/streamvolume.h>
#include "gstplay-enum.h" #include "gstplay-enum.h"
#include "gstplay-marshal.h" #include "gstplay-marshal.h"

3
gst/volume/gstvolume.c
View file

@ -45,8 +45,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/interfaces/mixer.h> #include <gst/audio/mixer.h>
#include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>
#ifdef HAVE_ORC #ifdef HAVE_ORC

2
gst/volume/gstvolume.h
View file

@ -26,7 +26,7 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
#include <gst/interfaces/streamvolume.h> #include <gst/audio/streamvolume.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/audio/gstaudiofilter.h> #include <gst/audio/gstaudiofilter.h>