summaryrefslogtreecommitdiff
path: root/orkaudio
diff options
context:
space:
mode:
Diffstat (limited to 'orkaudio')
-rw-r--r--orkaudio/Makefile.am2
-rw-r--r--orkaudio/audiofile/Makefile.am2
-rw-r--r--orkaudio/configure.in2
-rw-r--r--orkaudio/filters/Makefile.am2
-rw-r--r--orkaudio/filters/rtpmixer/Makefile.am7
-rw-r--r--orkaudio/filters/rtpmixer/RtpMixer.cpp3
6 files changed, 14 insertions, 4 deletions
diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am
index 7159c4d..afff9df 100644
--- a/orkaudio/Makefile.am
+++ b/orkaudio/Makefile.am
@@ -13,7 +13,7 @@ orkaudio_SOURCES = OrkAudio.cpp AudioTape.cpp \
MultiThreadedServer.cpp Reporting.cpp
AM_CPPFLAGS = -D_REENTRANT
INCLUDES = -I@top_srcdir@ -I../orkbasecxx
-SUBDIRS = audiocaptureplugins messages audiofile
+SUBDIRS = audiocaptureplugins messages audiofile filters
orkaudio_LDADD = $(top_builddir)/messages/libmessages.la \
$(top_builddir)/audiofile/libaudiofile.la
diff --git a/orkaudio/audiofile/Makefile.am b/orkaudio/audiofile/Makefile.am
index d6bddad..d737e11 100644
--- a/orkaudio/audiofile/Makefile.am
+++ b/orkaudio/audiofile/Makefile.am
@@ -1,6 +1,6 @@
METASOURCES = AUTO
noinst_LTLIBRARIES = libaudiofile.la
-libaudiofile_la_SOURCES = AudioFile.cpp LibSndFileFile.cpp PcmFile.cpp
+libaudiofile_la_SOURCES = MediaChunkFile.cpp AudioFile.cpp LibSndFileFile.cpp PcmFile.cpp
AM_CPPFLAGS = -D_REENTRANT
libaudiofile_la_LIBADD =
INCLUDES = -I@top_srcdir@ -I../../orkbasecxx
diff --git a/orkaudio/configure.in b/orkaudio/configure.in
index b07e008..6e9ea9d 100644
--- a/orkaudio/configure.in
+++ b/orkaudio/configure.in
@@ -9,4 +9,4 @@ AM_PROG_LIBTOOL
AC_PREFIX_DEFAULT(/usr)
-AC_OUTPUT(Makefile messages/Makefile audiofile/Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile)
+AC_OUTPUT(Makefile messages/Makefile audiofile/Makefile audiocaptureplugins/Makefile audiocaptureplugins/generator/Makefile audiocaptureplugins/voip/Makefile filters/Makefile filters/rtpmixer/Makefile)
diff --git a/orkaudio/filters/Makefile.am b/orkaudio/filters/Makefile.am
new file mode 100644
index 0000000..a2ac6a8
--- /dev/null
+++ b/orkaudio/filters/Makefile.am
@@ -0,0 +1,2 @@
+METASOURCES = AUTO
+SUBDIRS = rtpmixer
diff --git a/orkaudio/filters/rtpmixer/Makefile.am b/orkaudio/filters/rtpmixer/Makefile.am
new file mode 100644
index 0000000..03b3c8b
--- /dev/null
+++ b/orkaudio/filters/rtpmixer/Makefile.am
@@ -0,0 +1,7 @@
+METASOURCES = AUTO
+lib_LTLIBRARIES = librtpmixer.la
+librtpmixer_la_SOURCES = RtpMixer.cpp
+librtpmixer_la_LDFLAGS = -module
+AM_CPPFLAGS = -D_REENTRANT
+librtpmixer_la_LIBADD = -lACE -lxerces-c -llog4cxx -lorkbase
+INCLUDES = -I@top_srcdir@ -I../../../orkbasecxx -I../common
diff --git a/orkaudio/filters/rtpmixer/RtpMixer.cpp b/orkaudio/filters/rtpmixer/RtpMixer.cpp
index bbba476..07c6921 100644
--- a/orkaudio/filters/rtpmixer/RtpMixer.cpp
+++ b/orkaudio/filters/rtpmixer/RtpMixer.cpp
@@ -350,4 +350,5 @@ extern "C"
FilterRef filter(new RtpMixer());
FilterRegistry::instance()->RegisterFilter(filter);
}
-} \ No newline at end of file
+}
+