aggregator: hook up to build system

https://bugzilla.gnome.org/show_bug.cgi?id=739010

diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am
index 014b951..5e83157 100644 (file)
--- a/libs/gst/base/Makefile.am
+++ b/libs/gst/base/Makefile.am
@@ -4,6 +4,7 @@ libgstbase_@GST_API_VERSION@_la_DEPENDENCIES = \
        $(top_builddir)/gst/libgstreamer-@GST_API_VERSION@.la
 libgstbase_@GST_API_VERSION@_la_SOURCES = \
        gstadapter.c            \
+       gstaggregator.c         \
        gstbaseparse.c          \
        gstbasesink.c           \
        gstbasesrc.c            \
@@ -28,6 +29,7 @@ libgstbase_@GST_API_VERSION@includedir =              \
 libgstbase_@GST_API_VERSION@include_HEADERS =  \
        base.h                  \
        gstadapter.h            \
+       gstaggregator.h         \
        gstbaseparse.h          \
        gstbasesink.h           \
        gstbasesrc.h            \

diff --git a/libs/gst/base/base.h b/libs/gst/base/base.h
index 6646ce3..c2abd4e 100644 (file)
--- a/libs/gst/base/base.h
+++ b/libs/gst/base/base.h
@@ -23,6 +23,7 @@
 #define __GST_BASE_H__
 
 #include <gst/base/gstadapter.h>
+#include <gst/base/gstaggregator.h>
 #include <gst/base/gstbaseparse.h>
 #include <gst/base/gstbasesink.h>
 #include <gst/base/gstbasesrc.h>

diff --git a/libs/gst/base/gstaggregator.h b/libs/gst/base/gstaggregator.h
index fc2d6ae..ecbd152 100644 (file)
--- a/libs/gst/base/gstaggregator.h
+++ b/libs/gst/base/gstaggregator.h
@@ -21,11 +21,6 @@
 #ifndef __GST_AGGREGATOR_H__
 #define __GST_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>
 
 G_BEGIN_DECLS

diff --git a/libs/gst/base/meson.build b/libs/gst/base/meson.build
index a9fda0b..1d3b688 100644 (file)
--- a/libs/gst/base/meson.build
+++ b/libs/gst/base/meson.build
@@ -1,5 +1,6 @@
 gst_base_sources = [
   'gstadapter.c',
+  'gstaggregator.c',
   'gstbaseparse.c',
   'gstbasesink.c',
   'gstbasesrc.c',
@@ -18,6 +19,7 @@ gst_base_sources = [
 gst_base_headers = [
   'base.h',
   'gstadapter.h',
+  'gstaggregator.h',
   'gstbaseparse.h',
   'gstbasesink.h',
   'gstbasesrc.h',
@@ -82,6 +84,7 @@ gst_base_dep = declare_dependency(link_with : gst_base,
 
 install_headers('base.h',
   'gstadapter.h',
+  'gstaggregator.h',
   'gstbaseparse.h',
   'gstbasesink.h',
   'gstbasesrc.h',

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 2183eb5..ece2521 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -151,6 +151,7 @@ check_PROGRAMS =                            \
        $(REGISTRY_CHECKS)                      \
        $(LIBSABI_CHECKS)                       \
        libs/adapter                            \
+       libs/aggregator                         \
        libs/bitreader                          \
        libs/bytereader                         \
        libs/bytewriter                         \

diff --git a/tests/check/libs/.gitignore b/tests/check/libs/.gitignore
index 1e44b5f..43cb049 100644 (file)
--- a/tests/check/libs/.gitignore
+++ b/tests/check/libs/.gitignore
@@ -1,5 +1,6 @@
 .dirstamp
 adapter
+aggregator
 baseparse
 basesink
 basesrc

diff --git a/tests/check/meson.build b/tests/check/meson.build
index 4fa8627..381948b 100644 (file)
--- a/tests/check/meson.build
+++ b/tests/check/meson.build
@@ -54,6 +54,7 @@ core_tests = [
   [ 'gst/gstvalue.c' ],
   [ 'generic/states.c', not have_registry ],
   [ 'libs/adapter.c' ],
+  [ 'libs/aggregator.c' ],
   [ 'libs/baseparse.c' ],
   [ 'libs/basesrc.c', not have_registry ],
   [ 'libs/basesink.c', not have_registry ],

diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def
index 71f75dc..a65c611 100644 (file)
--- a/win32/common/libgstbase.def
+++ b/win32/common/libgstbase.def
@@ -30,6 +30,18 @@ EXPORTS
        gst_adapter_take_buffer_list
        gst_adapter_take_list
        gst_adapter_unmap
+       gst_aggregator_finish_buffer
+       gst_aggregator_get_allocator
+       gst_aggregator_get_buffer_pool
+       gst_aggregator_get_latency
+       gst_aggregator_get_type
+       gst_aggregator_pad_drop_buffer
+       gst_aggregator_pad_get_buffer
+       gst_aggregator_pad_get_type
+       gst_aggregator_pad_is_eos
+       gst_aggregator_pad_steal_buffer
+       gst_aggregator_set_latency
+       gst_aggregator_set_src_caps
        gst_base_parse_add_index_entry
        gst_base_parse_convert_default
        gst_base_parse_drain