audio-channel-mix: move channel mixer to audio libs

Move the channel mixer code to the audio library

9 files changed, 12 insertions, 9 deletions

diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index dee4e364a..f796cd6ae 100644
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -6,6 +6,7 @@ glib_enum_headers= 		\
 	audio.h			\
 	audio-format.h			\
 	audio-channels.h			\
+	audio-channel-mix.h			\
 	audio-info.h			\
 	audio-quantize.h			\
 	gstaudioringbuffer.h
@@ -27,6 +28,7 @@ libgstaudio_@GST_API_VERSION@_la_SOURCES = \
 	audio.c \
 	audio-format.c \
 	audio-channels.c \
+	audio-channel-mix.c \
 	audio-info.c \
 	audio-quantize.c \
 	gstaudioringbuffer.c \
@@ -51,6 +53,7 @@ libgstaudio_@GST_API_VERSION@include_HEADERS = \
 	audio.h \
 	audio-format.h \
 	audio-channels.h \
+	audio-channel-mix.h \
 	audio-info.h \
 	audio-quantize.h \
 	gstaudioringbuffer.h \
diff --git a/gst/audioconvert/gstchannelmix.c b/gst-libs/gst/audio/audio-channel-mix.c
index 86000e948..58f519814 100644
--- a/gst/audioconvert/gstchannelmix.c
+++ b/gst-libs/gst/audio/audio-channel-mix.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
  * Copyright (C) 2008 Sebastian Dröge <slomo@circular-chaos.org>
  *
- * gstchannelmix.c: setup of channel conversion matrices
+ * audio-channel-mix.c: setup of channel conversion matrices
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -27,7 +27,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "gstchannelmix.h"
+#include "audio-channel-mix.h"
 
 #ifndef GST_DISABLE_GST_DEBUG
 #define GST_CAT_DEFAULT ensure_debug_category()
diff --git a/gst/audioconvert/gstchannelmix.h b/gst-libs/gst/audio/audio-channel-mix.h
index fd969171e..caf08a218 100644
--- a/gst/audioconvert/gstchannelmix.h
+++ b/gst-libs/gst/audio/audio-channel-mix.h
@@ -2,7 +2,7 @@
  * Copyright (C) 2004 Ronald Bultje <rbultje@ronald.bitfreak.net>
  *           (C) 2015 Wim Taymans <wim.taymans@gmail.com>
  *
- * audiochannelmix.h: setup of channel conversion matrices
+ * audio-channel-mix.h: setup of channel conversion matrices
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index 277c2e9eb..4e695b134 100644
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -26,6 +26,7 @@
 #include <gst/audio/audio-enumtypes.h>
 #include <gst/audio/audio-format.h>
 #include <gst/audio/audio-channels.h>
+#include <gst/audio/audio-channel-mix.h>
 #include <gst/audio/audio-info.h>
 #include <gst/audio/audio-quantize.h>
 
diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am
index d29c6bbef..6923454f8 100644
--- a/gst/audioconvert/Makefile.am
+++ b/gst/audioconvert/Makefile.am
@@ -6,7 +6,6 @@ include $(top_srcdir)/common/orc.mak
 libgstaudioconvert_la_SOURCES = \
 	gstaudioconvert.c \
 	audioconvert.c \
-	gstchannelmix.c \
 	plugin.c
 nodist_libgstaudioconvert_la_SOURCES = $(ORC_NODIST_SOURCES)
 
@@ -20,5 +19,4 @@ libgstaudioconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 noinst_HEADERS = \
 	gstaudioconvert.h \
 	audioconvert.h \
-	gstchannelmix.h \
 	plugin.h
diff --git a/gst/audioconvert/audioconvert.c b/gst/audioconvert/audioconvert.c
index 06de29f98..bf7693bf7 100644
--- a/gst/audioconvert/audioconvert.c
+++ b/gst/audioconvert/audioconvert.c
@@ -27,7 +27,6 @@
 #include <math.h>
 #include <string.h>
 
-#include "gstchannelmix.h"
 #include "audioconvert.h"
 #include "gstaudioconvertorc.h"
 
diff --git a/gst/audioconvert/audioconvert.h b/gst/audioconvert/audioconvert.h
index b0a91654c..39fb50add 100644
--- a/gst/audioconvert/audioconvert.h
+++ b/gst/audioconvert/audioconvert.h
@@ -26,8 +26,6 @@
 #include <gst/gst.h>
 #include <gst/audio/audio.h>
 
-#include "gstchannelmix.h"
-
 typedef struct _GstAudioConverter GstAudioConverter;
 
 /**
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 4476acff7..bd60b334d 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -63,7 +63,6 @@
 #include <string.h>
 
 #include "gstaudioconvert.h"
-#include "gstchannelmix.h"
 #include "plugin.h"
 
 GST_DEBUG_CATEGORY (audio_convert_debug);
diff --git a/win32/common/libgstaudio.def b/win32/common/libgstaudio.def
index 37b746c5d..97364be61 100644
--- a/win32/common/libgstaudio.def
+++ b/win32/common/libgstaudio.def
@@ -28,6 +28,11 @@ EXPORTS
 	gst_audio_cd_src_get_type
 	gst_audio_cd_src_mode_get_type
 	gst_audio_channel_get_fallback_mask
+	gst_audio_channel_mix_flags_get_type
+	gst_audio_channel_mix_free
+	gst_audio_channel_mix_is_passthrough
+	gst_audio_channel_mix_new
+	gst_audio_channel_mix_samples
 	gst_audio_channel_position_get_type
 	gst_audio_channel_positions_from_mask
 	gst_audio_channel_positions_to_mask