From 4647d6684fb5d813a6303fa77c651e98a41e6a10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Tue, 13 Feb 2018 16:09:09 +0000
Subject: [PATCH] GstAudioAggregator: hook up to build

https://bugzilla.gnome.org/show_bug.cgi?id=791218
---
 docs/libs/gst-plugins-base-libs.types           | 4 +++-
 docs/plugins/gst-plugins-base-plugins.hierarchy | 9 +++++++++
 gst-libs/gst/audio/Makefile.am                  | 2 ++
 gst-libs/gst/audio/gstaudioaggregator.h         | 5 -----
 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 047575a825..a97e95220c 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 62dae4271f..845a8118ac 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 100867db4e..358adbc32e 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 b32630ee67..79f93248b9 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 5074ddfed3..86f49b9af5 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',