From ed735626b66356eb24ec75325546e69b744b539c Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Wed, 1 Feb 2006 16:08:00 +0000 Subject: Dropped remote indicator when reporting an audio chunk git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@151 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkaudio/AudioCapturePlugin.h | 2 +- orkaudio/AudioTape.cpp | 11 ++--------- orkaudio/AudioTape.h | 3 +-- orkaudio/BatchProcessing.cpp | 7 ++++++- orkaudio/CapturePluginProxy.cpp | 4 ++-- orkaudio/CapturePluginProxy.h | 2 +- orkaudio/CapturePort.cpp | 4 ++-- orkaudio/CapturePort.h | 2 +- 8 files changed, 16 insertions(+), 19 deletions(-) (limited to 'orkaudio') diff --git a/orkaudio/AudioCapturePlugin.h b/orkaudio/AudioCapturePlugin.h index d2bd2e7..e52fe97 100644 --- a/orkaudio/AudioCapturePlugin.h +++ b/orkaudio/AudioCapturePlugin.h @@ -29,7 +29,7 @@ using namespace XERCES_CPP_NAMESPACE; #define AUDIO_CAPTURE_PLUGIN_INTERFACE_VERSION 1 // Callback definitions -typedef void (__CDECL__*AudioChunkCallBackFunction)(AudioChunkRef, CStdString& capturePort, bool remote = false); +typedef void (__CDECL__*AudioChunkCallBackFunction)(AudioChunkRef, CStdString& capturePort); typedef void (__CDECL__*CaptureEventCallBackFunction)(CaptureEventRef, CStdString& capturePort); diff --git a/orkaudio/AudioTape.cpp b/orkaudio/AudioTape.cpp index 75962c8..eaae2d2 100644 --- a/orkaudio/AudioTape.cpp +++ b/orkaudio/AudioTape.cpp @@ -76,20 +76,13 @@ AudioTape::AudioTape(CStdString &portId) } -void AudioTape::AddAudioChunk(AudioChunkRef chunkRef, bool remote) +void AudioTape::AddAudioChunk(AudioChunkRef chunkRef) { // Add the chunk to the local queue if(m_state == StateCreated || m_state == StateActive) { MutexSentinel sentinel(m_mutex); - if(remote) - { - m_remoteChunkQueue.push(chunkRef); - } - else - { - m_chunkQueue.push(chunkRef); - } + m_chunkQueue.push(chunkRef); } } diff --git a/orkaudio/AudioTape.h b/orkaudio/AudioTape.h index 9870c46..899fda0 100644 --- a/orkaudio/AudioTape.h +++ b/orkaudio/AudioTape.h @@ -80,7 +80,7 @@ public: AudioTape(CStdString &portId); - void AddAudioChunk(AudioChunkRef chunkRef, bool remote = false); + void AddAudioChunk(AudioChunkRef chunkRef); void Write(); void SetShouldStop(); bool IsStoppedAndValid(); @@ -108,7 +108,6 @@ private: CStdString m_fileExtension; //Corresponds to the extension the tape will have after compression std::queue m_chunkQueue; - std::queue m_remoteChunkQueue; // used if stereo capture std::queue m_eventQueue; std::queue m_toSendEventQueue; diff --git a/orkaudio/BatchProcessing.cpp b/orkaudio/BatchProcessing.cpp index 59e78e5..39145c7 100644 --- a/orkaudio/BatchProcessing.cpp +++ b/orkaudio/BatchProcessing.cpp @@ -141,11 +141,16 @@ void BatchProcessing::ThreadHandler(void *args) decoder1->AudioChunkIn(chunkRef); decoder1->AudioChunkOut(chunkRef); } - + //if(details.m_channel == 1) + //{ filter->AudioChunkIn(chunkRef); filter->AudioChunkOut(chunkRef); + //} } + //if(details.m_channel == 1) + //{ outFileRef->WriteChunk(chunkRef); + //} } fileRef->Close(); diff --git a/orkaudio/CapturePluginProxy.cpp b/orkaudio/CapturePluginProxy.cpp index 02a79c0..4163293 100644 --- a/orkaudio/CapturePluginProxy.cpp +++ b/orkaudio/CapturePluginProxy.cpp @@ -191,11 +191,11 @@ void CapturePluginProxy::StopCapture(CStdString& capturePort) } } -void __CDECL__ CapturePluginProxy::AudioChunkCallBack(AudioChunkRef chunkRef, CStdString& capturePort, bool remote) +void __CDECL__ CapturePluginProxy::AudioChunkCallBack(AudioChunkRef chunkRef, CStdString& capturePort) { // find the right port and give it the audio chunk CapturePortRef portRef = CapturePortsSingleton::instance()->AddAndReturnPort(capturePort); - portRef->AddAudioChunk(chunkRef, remote); + portRef->AddAudioChunk(chunkRef); } void __CDECL__ CapturePluginProxy::CaptureEventCallBack(CaptureEventRef eventRef, CStdString& capturePort) diff --git a/orkaudio/CapturePluginProxy.h b/orkaudio/CapturePluginProxy.h index 1d1da1a..1df35d9 100644 --- a/orkaudio/CapturePluginProxy.h +++ b/orkaudio/CapturePluginProxy.h @@ -30,7 +30,7 @@ public: void StartCapture(CStdString& capturePort); void StopCapture(CStdString& capturePort); - static void __CDECL__ AudioChunkCallBack(AudioChunkRef chunkRef, CStdString& capturePort, bool remote = false); + static void __CDECL__ AudioChunkCallBack(AudioChunkRef chunkRef, CStdString& capturePort); static void __CDECL__ CaptureEventCallBack(CaptureEventRef eventRef, CStdString& capturePort); private: ConfigureFunction m_configureFunction; diff --git a/orkaudio/CapturePort.cpp b/orkaudio/CapturePort.cpp index dceb6f4..27e3943 100644 --- a/orkaudio/CapturePort.cpp +++ b/orkaudio/CapturePort.cpp @@ -34,7 +34,7 @@ CStdString CapturePort::ToString() return ret; } -void CapturePort::AddAudioChunk(AudioChunkRef chunkRef, bool remote) +void CapturePort::AddAudioChunk(AudioChunkRef chunkRef) { time_t now = time(NULL); @@ -130,7 +130,7 @@ void CapturePort::AddAudioChunk(AudioChunkRef chunkRef, bool remote) if (m_audioTapeRef.get() && m_capturing) { - m_audioTapeRef->AddAudioChunk(chunkRef, remote); + m_audioTapeRef->AddAudioChunk(chunkRef); // Signal to immediate processing thread that tape has new stuff ImmediateProcessing::GetInstance()->AddAudioTape(m_audioTapeRef); diff --git a/orkaudio/CapturePort.h b/orkaudio/CapturePort.h index 6d665b1..bd62731 100644 --- a/orkaudio/CapturePort.h +++ b/orkaudio/CapturePort.h @@ -34,7 +34,7 @@ public: CapturePort(CStdString& Id); CStdString ToString(); - void AddAudioChunk(AudioChunkRef chunkRef, bool remote = false); + void AddAudioChunk(AudioChunkRef chunkRef); void AddCaptureEvent(CaptureEventRef eventRef); private: CStdString m_Id; -- cgit v1.2.3