diff options
| author | Henri Herscher <henri@oreka.org> | 2006-01-21 02:38:45 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2006-01-21 02:38:45 +0000 |
| commit | 33506288a1f574a4e3484e2f9c765e47a7bab29b (patch) | |
| tree | af4ae21d168b12e2405b74f35c226c5064451448 | |
| parent | 2ecfb41cfcb7ccd7f9340a721e483d9d554b31d2 (diff) | |
fixes to change VoIpMixer to RtpMixer
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@125 09dcff7a-b715-0410-9601-b79a96267cd0
| -rw-r--r-- | orkaudio/BatchProcessing.cpp | 7 | ||||
| -rw-r--r-- | orkaudio/OrkAudio.cpp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/orkaudio/BatchProcessing.cpp b/orkaudio/BatchProcessing.cpp index 90f2b7b..59e78e5 100644 --- a/orkaudio/BatchProcessing.cpp +++ b/orkaudio/BatchProcessing.cpp @@ -113,8 +113,13 @@ void BatchProcessing::ThreadHandler(void *args) if(firstChunk && details.m_rtpPayloadType != -1) { firstChunk = false; - CStdString filterName("VoIpMixer"); + CStdString filterName("RtpMixer"); filter = FilterRegistry::instance()->GetNewFilter(filterName); + if(filter.get() == NULL) + { + debug = "BatchProcessing - Could not instanciate RTP mixer"; + throw(debug); + } decoder1 = FilterRegistry::instance()->GetNewFilter(details.m_rtpPayloadType); decoder2 = FilterRegistry::instance()->GetNewFilter(details.m_rtpPayloadType); if(decoder1.get() == NULL || decoder2.get() == NULL) diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp index daea814..45f697f 100644 --- a/orkaudio/OrkAudio.cpp +++ b/orkaudio/OrkAudio.cpp @@ -81,8 +81,8 @@ void MainThread() FilterRegistry::instance()->RegisterFilter(filter); // Load filter plugins ##################### - //CStdString pluginPath = "./filters/VoIpMixer/Debug/VoIpMixer.dll"; - CStdString pluginPath = "./filters/VoIpMixer.dll"; + //CStdString pluginPath = "./filters/RtpMixer/Debug/RtpMixer.dll"; + CStdString pluginPath = "./filters/RtpMixer.dll"; ACE_DLL dll; dll.open((PCSTR)pluginPath); ACE_TCHAR* error = dll.error(); |