diff options
| author | Henri Herscher <henri@oreka.org> | 2006-01-24 16:29:24 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2006-01-24 16:29:24 +0000 |
| commit | 315c4996054c44ce47e8bd902c4330a07436314b (patch) | |
| tree | 1c9142884bb296d9911b635115c2e1f60cf83ce4 | |
| parent | 1f9e4ca872a718619faed56acfdaff69b1237fa8 (diff) | |
DLL initialize hook becomes "OrkInitialize"
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@131 09dcff7a-b715-0410-9601-b79a96267cd0
| -rw-r--r-- | orkaudio/AudioTape.cpp | 16 | ||||
| -rw-r--r-- | orkaudio/CapturePort.cpp | 7 | ||||
| -rw-r--r-- | orkaudio/OrkAudio.cpp | 6 |
3 files changed, 6 insertions, 23 deletions
diff --git a/orkaudio/AudioTape.cpp b/orkaudio/AudioTape.cpp index c7ea945..75962c8 100644 --- a/orkaudio/AudioTape.cpp +++ b/orkaudio/AudioTape.cpp @@ -125,19 +125,9 @@ void AudioTape::Write() switch(chunkRef->GetEncoding()) { case PcmAudio: - //m_audioFileRef.reset(new PcmFile); - //break; - case UlawAudio: - //m_audioFileRef.reset(new LibSndFileFile(SF_FORMAT_ULAW | SF_FORMAT_WAV)); - //break; - case AlawAudio: - //m_audioFileRef.reset(new LibSndFileFile(SF_FORMAT_ALAW | SF_FORMAT_WAV)); - //break; - default: - //LOG4CXX_ERROR(LOG.portLog, "#" + m_portId + ": received unsupported audio encoding from capture plugin:" + FileFormatToString(chunkRef->GetEncoding())); - //m_state = StateError; - - // ########### + m_audioFileRef.reset(new LibSndFileFile(SF_FORMAT_PCM_16 | SF_FORMAT_WAV)); + break; + default: // All other encodings: output as a media chunk file m_audioFileRef.reset(new MediaChunkFile()); } diff --git a/orkaudio/CapturePort.cpp b/orkaudio/CapturePort.cpp index fa5a4e1..dceb6f4 100644 --- a/orkaudio/CapturePort.cpp +++ b/orkaudio/CapturePort.cpp @@ -128,13 +128,6 @@ void CapturePort::AddAudioChunk(AudioChunkRef chunkRef, bool remote) } } - // ############ - //if (!m_audioTapeRef.get()) - //{ - // m_audioTapeRef.reset(new AudioTape(m_Id)); - // LOG4CXX_WARN(LOG.portLog, CStdString("Got impromptu audio")); - //} - if (m_audioTapeRef.get() && m_capturing) { m_audioTapeRef->AddAudioChunk(chunkRef, remote); diff --git a/orkaudio/OrkAudio.cpp b/orkaudio/OrkAudio.cpp index 45f697f..f821d7d 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/RtpMixer/Debug/RtpMixer.dll"; - CStdString pluginPath = "./filters/RtpMixer.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(); @@ -97,7 +97,7 @@ void MainThread() //void (*initfunction)(void); InitializeFunction initfunction; - initfunction = (InitializeFunction)dll.symbol("Initialize"); + initfunction = (InitializeFunction)dll.symbol("OrkInitialize"); if (initfunction) { |