Commit 8c5725c4 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

audiomixer, audiointerleave: add to build

https://bugzilla.gnome.org/show_bug.cgi?id=791218
parent 4647d668
......@@ -479,6 +479,7 @@ dnl these are all the gst plug-ins, compilable without additional libs
AG_GST_CHECK_PLUGIN(adder)
AG_GST_CHECK_PLUGIN(app)
AG_GST_CHECK_PLUGIN(audioconvert)
AG_GST_CHECK_PLUGIN(audiomixer)
AG_GST_CHECK_PLUGIN(audiorate)
AG_GST_CHECK_PLUGIN(audiotestsrc)
AG_GST_CHECK_PLUGIN(encoding)
......@@ -893,6 +894,7 @@ gst/Makefile
gst/adder/Makefile
gst/app/Makefile
gst/audioconvert/Makefile
gst/audiomixer/Makefile
gst/audiorate/Makefile
gst/audioresample/Makefile
gst/audiotestsrc/Makefile
......
......@@ -7,14 +7,11 @@ include $(top_srcdir)/common/orc.mak
libgstaudiomixer_la_SOURCES = gstaudiomixer.c gstaudiointerleave.c
nodist_libgstaudiomixer_la_SOURCES = $(ORC_NODIST_SOURCES)
libgstaudiomixer_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
-I$(top_builddir)/gst-libs \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) $(ORC_CFLAGS)
libgstaudiomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstaudiomixer_la_LIBADD = \
$(top_builddir)/gst-libs/gst/audio/libgstbadaudio-$(GST_API_VERSION).la \
$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-$(GST_API_VERSION).la \
$(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
noinst_HEADERS = gstaudiomixer.h gstaudiointerleave.h
......
......@@ -24,9 +24,9 @@ endif
gstaudiomixer = library('gstaudiomixer',
audiomixer_sources, orc_c, orc_h,
c_args : gst_plugins_bad_args + [ '-DGST_USE_UNSTABLE_API' ],
c_args : gst_plugins_base_args,
include_directories : [configinc],
dependencies : [gstbadaudio_dep, gstaudio_dep, gstbase_dep, orc_dep],
dependencies : [audio_dep, gst_base_dep, orc_dep],
install : true,
install_dir : plugins_install_dir,
)
subdir('adder')
subdir('app')
subdir('audioconvert')
subdir('audiomixer')
subdir('audiorate')
subdir('audioresample')
subdir('audiotestsrc')
......
......@@ -92,6 +92,12 @@ else
check_audioconvert =
endif
if USE_PLUGIN_AUDIOMIXER
check_audiomixer = elements/audiointerleave elements/audiomixer
else
check_audiomixer =
endif
if USE_PLUGIN_PLAYBACK
check_playback = elements/decodebin elements/playbin \
elements/playbin-complex elements/streamsynchronizer \
......@@ -173,7 +179,7 @@ check_adder =
endif
if HAVE_ORC
check_orc = orc/video orc/audio orc/adder orc/volume orc/videotestsrc
check_orc = orc/video orc/audio orc/audiomixer orc/adder orc/volume orc/videotestsrc
else
check_orc =
endif
......@@ -253,6 +259,7 @@ check_PROGRAMS = \
$(check_adder) \
$(check_app) \
$(check_audioconvert) \
$(check_audiomixer) \
$(check_audiorate) \
$(check_audioresample) \
$(check_audiotestsrc) \
......@@ -636,6 +643,21 @@ elements_audioconvert_LDADD = \
$(GST_BASE_LIBS) \
$(LDADD)
elements_audiomixer_LDADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
$(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) \
$(LDADD)
elements_audiomixer_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) \
$(AM_CFLAGS)
elements_audiointerleave_LDADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
$(GST_BASE_LIBS) $(LDADD)
elements_audiointerleave_CFLAGS = \
$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
elements_audiorate_LDADD = \
$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
$(GST_BASE_LIBS) \
......@@ -851,6 +873,9 @@ nodist_orc_audio_SOURCES = orc/audio.c
orc_adder_CFLAGS = $(ORC_CFLAGS)
orc_adder_LDADD = $(ORC_LIBS) -lorc-test-0.4
nodist_orc_adder_SOURCES = orc/adder.c
orc_audiomixer_CFLAGS = $(ORC_CFLAGS)
orc_audiomixer_LDADD = $(ORC_LIBS) -lorc-test-0.4
nodist_orc_audiomixer_SOURCES = orc/audiomixer.c
orc_volume_CFLAGS = $(ORC_CFLAGS)
orc_volume_LDADD = $(ORC_LIBS) -lorc-test-0.4
nodist_orc_volume_SOURCES = orc/volume.c
......@@ -866,6 +891,10 @@ orc/audio.c: $(top_srcdir)/gst-libs/gst/audio/gstaudiopack.orc
$(MKDIR_P) orc/
$(ORCC) --test -o $@ $<
orc/audiomixer.c: $(top_srcdir)/gst/audiomixer/gstaudiomixerorc.orc
$(MKDIR_P) orc
$(ORCC) --test -o $@ $<
orc/adder.c: $(top_srcdir)/gst/adder/gstadderorc.orc
$(MKDIR_P) orc/
$(ORCC) --test -o $@ $<
......
......@@ -4,6 +4,8 @@ alsa
appsink
appsrc
audioconvert
audiointerleave
audiomixer
audiorate
audioresample
audiotestsrc
......
......@@ -31,6 +31,8 @@ base_tests = [
[ 'elements/appsink.c' ],
[ 'elements/appsrc.c' ],
[ 'elements/audioconvert.c' ],
[ 'elements/audiointerleave.c' ],
[ 'elements/audiomixer.c', false, [ gst_controller_dep ] ],
[ 'elements/audiorate.c' ],
[ 'elements/audiotestsrc.c' ],
[ 'elements/audioresample.c' ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment