diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-02-13 16:09:09 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-02-13 16:09:09 +0000 |
| commit | 4647d6684fb5d813a6303fa77c651e98a41e6a10 (patch) | |
| tree | 3fa87762a9e1f00eaaea55b491a524b7b685f414 | |
| parent | ab758a9a39f4bc6dc9f32d03541c122b9618afec (diff) | |
GstAudioAggregator: hook up to build
https://bugzilla.gnome.org/show_bug.cgi?id=791218
| -rw-r--r-- | docs/libs/gst-plugins-base-libs.types | 4 | ||||
| -rw-r--r-- | docs/plugins/gst-plugins-base-plugins.hierarchy | 9 | ||||
| -rw-r--r-- | gst-libs/gst/audio/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/audio/gstaudioaggregator.h | 5 | ||||
| -rw-r--r-- | gst-libs/gst/audio/meson.build | 2 |
5 files changed, 16 insertions, 6 deletions
diff --git a/docs/libs/gst-plugins-base-libs.types b/docs/libs/gst-plugins-base-libs.types index 047575a82..a97e95220 100644 --- a/docs/libs/gst-plugins-base-libs.types +++ b/docs/libs/gst-plugins-base-libs.types @@ -1,6 +1,8 @@ #include <gst/gst.h> - +#include <gst/audio/gstaudioaggregator.h> +gst_audio_aggregator_get_type +gst_audio_aggregator_pad_get_type #include <gst/audio/gstaudiocdsrc.h> gst_audio_cd_src_get_type #include <gst/audio/gstaudioclock.h> diff --git a/docs/plugins/gst-plugins-base-plugins.hierarchy b/docs/plugins/gst-plugins-base-plugins.hierarchy index 62dae4271..845a8118a 100644 --- a/docs/plugins/gst-plugins-base-plugins.hierarchy +++ b/docs/plugins/gst-plugins-base-plugins.hierarchy @@ -14,6 +14,11 @@ GObject GstControlSource GstElement GstAdder + GstAggregator + GstAudioAggregator + GstAudioInterleave + GstAudioMixer + GstLiveAdder GstAudioDecoder GstOpusDec GstVorbisDec @@ -160,6 +165,10 @@ GObject GstGLContext GstGLShader GstPad + GstAggregatorPad + GstAudioAggregatorPad + GstAudioInterleavePad + GstAudioMixerPad GstProxyPad GstGhostPad GstDecodePad diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 100867db4..358adbc32 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -41,6 +41,7 @@ libgstaudio_@GST_API_VERSION@_la_SOURCES = \ audio-info.c \ audio-quantize.c \ audio-resampler.c \ + gstaudioaggregator.c \ gstaudioringbuffer.c \ gstaudioclock.c \ gstaudiocdsrc.c \ @@ -69,6 +70,7 @@ libgstaudio_@GST_API_VERSION@include_HEADERS = \ audio-info.h \ audio-quantize.h \ audio-resampler.h \ + gstaudioaggregator.h \ gstaudioringbuffer.h \ gstaudioclock.h \ gstaudiofilter.h \ diff --git a/gst-libs/gst/audio/gstaudioaggregator.h b/gst-libs/gst/audio/gstaudioaggregator.h index b32630ee6..79f93248b 100644 --- a/gst-libs/gst/audio/gstaudioaggregator.h +++ b/gst-libs/gst/audio/gstaudioaggregator.h @@ -23,11 +23,6 @@ #ifndef __GST_AUDIO_AGGREGATOR_H__ #define __GST_AUDIO_AGGREGATOR_H__ -#ifndef GST_USE_UNSTABLE_API -#warning "The Base library from gst-plugins-bad is unstable API and may change in future." -#warning "You can define GST_USE_UNSTABLE_API to avoid this warning." -#endif - #include <gst/gst.h> #include <gst/base/gstaggregator.h> #include <gst/audio/audio.h> diff --git a/gst-libs/gst/audio/meson.build b/gst-libs/gst/audio/meson.build index 5074ddfed..86f49b9af 100644 --- a/gst-libs/gst/audio/meson.build +++ b/gst-libs/gst/audio/meson.build @@ -7,6 +7,7 @@ audio_src= [ 'audio-info.c', 'audio-quantize.c', 'audio-resampler.c', + 'gstaudioaggregator.c', 'gstaudiobasesink.c', 'gstaudiobasesrc.c', 'gstaudiocdsrc.c', @@ -33,6 +34,7 @@ audio_mkenum_headers = [ 'audio-info.h', 'audio-quantize.h', 'audio-resampler.h', + 'gstaudioaggregator.h', 'gstaudioringbuffer.h', 'gstaudiobasesrc.h', 'gstaudiocdsrc.h', |