diff options
author | Henri Herscher <henri@oreka.org> | 2007-09-12 18:24:50 +0000 |
---|---|---|
committer | Henri Herscher <henri@oreka.org> | 2007-09-12 18:24:50 +0000 |
commit | 9a9d5268c35a25a6c574db889fbe7300a650d900 (patch) | |
tree | bf21c0b7b3838d69c3bdb38f5d36d9ac83a7e62e /orkbasecxx | |
parent | 18dd3cfeaa01293e3a575b53acc633955ce738cd (diff) |
Reporting READY state is now a tape processor.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@487 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx')
-rw-r--r-- | orkbasecxx/AudioTape.cpp | 7 | ||||
-rw-r--r-- | orkbasecxx/BatchProcessing.cpp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/orkbasecxx/AudioTape.cpp b/orkbasecxx/AudioTape.cpp index 09e8418..ec0de0c 100644 --- a/orkbasecxx/AudioTape.cpp +++ b/orkbasecxx/AudioTape.cpp @@ -316,7 +316,12 @@ void AudioTape::GetMessage(MessageRef& msgRef) msgRef.reset(new TapeMsg); TapeMsg* pTapeMsg = (TapeMsg*)msgRef.get(); - if(captureEventRef->m_type == CaptureEvent::EtStop || captureEventRef->m_type == CaptureEvent::EtStart || captureEventRef->m_type == CaptureEvent::EtReady || captureEventRef->m_type == CaptureEvent::EtUpdate) + if(captureEventRef.get() == 0) + { + // No more events, the tape is ready + PopulateTapeMessage(pTapeMsg, CaptureEvent::EtReady); + } + else if(captureEventRef->m_type == CaptureEvent::EtStop || captureEventRef->m_type == CaptureEvent::EtStart || captureEventRef->m_type == CaptureEvent::EtUpdate) { PopulateTapeMessage(pTapeMsg, captureEventRef->m_type); } diff --git a/orkbasecxx/BatchProcessing.cpp b/orkbasecxx/BatchProcessing.cpp index 6cd4c68..42d646a 100644 --- a/orkbasecxx/BatchProcessing.cpp +++ b/orkbasecxx/BatchProcessing.cpp @@ -345,13 +345,6 @@ void BatchProcessing::ThreadHandler(void *args) LOG4CXX_INFO(LOG.batchProcessingLog, "[" + trackingId + "] Th" + threadIdString + " deleting native: " + audioTapeRef->GetIdentifier()); } - // Report tape ready message to orktrack - CaptureEventRef readyEvent(new CaptureEvent); - readyEvent->m_type = CaptureEvent::EtReady; - readyEvent->m_timestamp = time(NULL); - audioTapeRef->AddCaptureEvent(readyEvent, true); - Reporting::Instance()->AddAudioTape(audioTapeRef); - // Finished processing the tape, pass on to next processor pBatchProcessing->RunNextProcessor(audioTapeRef); } |