diff options
Diffstat (limited to 'orkaudio')
| -rw-r--r-- | orkaudio/Makefile.am | 2 | ||||
| -rw-r--r-- | orkaudio/OrkAudio.cpp | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/orkaudio/Makefile.am b/orkaudio/Makefile.am index cd3ad52..c475d4c 100644 --- a/orkaudio/Makefile.am +++ b/orkaudio/Makefile.am @@ -8,7 +8,7 @@ orkaudio_LDADD = orkaudio_LDFLAGS = -lACE -lxerces-c -llog4cxx -lorkbase -lsndfile orkaudio_SOURCES = OrkAudio.cpp AM_CPPFLAGS = -D_REENTRANT -INCLUDES = -I@top_srcdir@ -I../orkbasecxx -I../orkbasecxx/filters/gsm -I../orkbasecxx/filters/gsm/gsm610 -I../orkbasecxx/filters/ilbc -I../orkbasecxx/filters/ilbc/ilbc -I../orkbasecxx/filters/audiogain +INCLUDES = -I@top_srcdir@ -I../orkbasecxx -I../orkbasecxx/filters/gsm -I../orkbasecxx/filters/gsm/gsm610 -I../orkbasecxx/filters/ilbc -I../orkbasecxx/filters/ilbc/ilbc -I../orkbasecxx/filters/audiogain -I../orkbasecxx/filters/g722codec SUBDIRS = audiocaptureplugins filters #orkaudio_LDADD = $(top_builddir)/messages/libmessages.la diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp index 12531ff..be0dead 100644 --- a/orkaudio/OrkAudio.cpp +++ b/orkaudio/OrkAudio.cpp @@ -41,13 +41,11 @@ #include "Filter.h" #include "GsmFilters.h" #include "IlbcFilters.h" +#include "G722Codec.h" #include "filters/audiogain/AudioGain.h" #include "TapeProcessor.h" #include <list> #include "EventStreaming.h" -#ifdef WIN32 -#include "G722Codec.h" -#endif static volatile bool serviceStop = false; @@ -156,10 +154,8 @@ void Transcode(CStdString &file) FilterRegistry::instance()->RegisterFilter(filter); filter.reset(new AudioGainFilter()); FilterRegistry::instance()->RegisterFilter(filter); -#ifdef WIN32 - filter.reset(new G722Decoder()); + filter.reset(new G722ToPcmFilter()); FilterRegistry::instance()->RegisterFilter(filter); -#endif // Register in-built tape processors and build the processing chain BatchProcessing::Initialize(); @@ -245,10 +241,8 @@ void MainThread() FilterRegistry::instance()->RegisterFilter(filter); filter.reset(new AudioGainFilter()); FilterRegistry::instance()->RegisterFilter(filter); -#ifdef WIN32 - filter.reset(new G722Decoder()); + filter.reset(new G722ToPcmFilter()); FilterRegistry::instance()->RegisterFilter(filter); -#endif // Register in-built tape processors and build the processing chain BatchProcessing::Initialize(); |