diff options
| author | Gerald Begumisa <ben_g@users.sourceforge.net> | 2009-01-10 18:59:09 +0000 |
|---|---|---|
| committer | Gerald Begumisa <ben_g@users.sourceforge.net> | 2009-01-10 18:59:09 +0000 |
| commit | 650105c2e53d80741292d2752cb48b3d9625ca09 (patch) | |
| tree | 201b2c042ba789958a9b0a643b423ba10d0483f6 /orkaudio | |
| parent | 99a4b62e59b63bfd232ace0b3768e10e0f47ceb3 (diff) | |
Made modifications to have G722 decoder compile in Windows.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@592 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkaudio')
| -rw-r--r-- | orkaudio/OrkAudio.cpp | 13 | ||||
| -rw-r--r-- | orkaudio/OrkAudio.dsp | 4 |
2 files changed, 14 insertions, 3 deletions
diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp index edda45a..12531ff 100644 --- a/orkaudio/OrkAudio.cpp +++ b/orkaudio/OrkAudio.cpp @@ -45,6 +45,9 @@ #include "TapeProcessor.h" #include <list> #include "EventStreaming.h" +#ifdef WIN32 +#include "G722Codec.h" +#endif static volatile bool serviceStop = false; @@ -150,9 +153,13 @@ void Transcode(CStdString &file) filter.reset(new GsmToPcmFilter()); FilterRegistry::instance()->RegisterFilter(filter); filter.reset(new IlbcToPcmFilter()); - FilterRegistry::instance()->RegisterFilter(filter); + FilterRegistry::instance()->RegisterFilter(filter); filter.reset(new AudioGainFilter()); FilterRegistry::instance()->RegisterFilter(filter); +#ifdef WIN32 + filter.reset(new G722Decoder()); + FilterRegistry::instance()->RegisterFilter(filter); +#endif // Register in-built tape processors and build the processing chain BatchProcessing::Initialize(); @@ -238,6 +245,10 @@ void MainThread() FilterRegistry::instance()->RegisterFilter(filter); filter.reset(new AudioGainFilter()); FilterRegistry::instance()->RegisterFilter(filter); +#ifdef WIN32 + filter.reset(new G722Decoder()); + FilterRegistry::instance()->RegisterFilter(filter); +#endif // Register in-built tape processors and build the processing chain BatchProcessing::Initialize(); diff --git a/orkaudio/OrkAudio.dsp b/orkaudio/OrkAudio.dsp index dcaf1c6..aae2d84 100644 --- a/orkaudio/OrkAudio.dsp +++ b/orkaudio/OrkAudio.dsp @@ -41,7 +41,7 @@ RSC=rc.exe # PROP Intermediate_Dir "Release" # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /Ob0 /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c +# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /Op /Ob0 /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /I "..\OrkBaseCxx\filters\g722codec" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "." /I "..\OrkBaseCxx" /I "..\OrkBaseCxx\filters\gsm" /I "..\OrkBaseCxx\filters\ilbc" /I "..\OrkBaseCxx\filters\ilbc\ilbc" /I "C:\devExt\libsndfile\src\GSM610" /I "C:\devExt\boost\boost_1_32_0\\" /I "C:\devExt\ACE_wrappers" /I "C:\devExt\log4cxx\log4cxx-0.9.7\include" /I "C:\devExt\xerces++\xerces-c_2_6_0-windows_nt-msvc_60\include" /I "C:\devExt\libsndfile\src" /I "..\OrkBaseCxx\filters\g722codec" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" BSC32=bscmake.exe |