diff options
| author | Henri Herscher <henri@oreka.org> | 2006-03-15 17:21:23 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2006-03-15 17:21:23 +0000 |
| commit | 595c3e4b698d52789a20aebfa71c1f7a3c28063f (patch) | |
| tree | 5b43e2ccfa5db910bf414ab379cfbe450625eee6 | |
| parent | e637980097f0b389321879368260444853e4f9f5 (diff) | |
Fixed Linux compilation errors
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@195 09dcff7a-b715-0410-9601-b79a96267cd0
| -rw-r--r-- | orkaudio/BatchProcessing.cpp | 6 | ||||
| -rw-r--r-- | orkaudio/messages/TapeMsg.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/orkaudio/BatchProcessing.cpp b/orkaudio/BatchProcessing.cpp index 1d47f10..6d65afe 100644 --- a/orkaudio/BatchProcessing.cpp +++ b/orkaudio/BatchProcessing.cpp @@ -138,8 +138,9 @@ void BatchProcessing::ThreadHandler(void *args) else { fileRef = audioTapeRef->GetAudioFileRef(); + CStdString filename = audioTapeRef->GetFilename(); - if(pBatchProcessing->DropTapeIfNeeded(audioTapeRef->GetFilename()) == true) + if(pBatchProcessing->DropTapeIfNeeded(filename) == true) { // The tape we have pulled has been dropped in the meantime. just delete the capture file if(CONFIG.m_deleteNativeFile) @@ -238,7 +239,8 @@ void BatchProcessing::ThreadHandler(void *args) CStdString threadIdString = IntToString(threadId); LOG4CXX_INFO(LOG.batchProcessingLog, CStdString("Th") + threadIdString + " deleting native: " + audioTapeRef->GetIdentifier()); } - pBatchProcessing->DropTapeIfNeeded(audioTapeRef->GetFilename()); // maybe the tape was dropped while we were processing it + CStdString filename = audioTapeRef->GetFilename(); + pBatchProcessing->DropTapeIfNeeded(filename); // maybe the tape was dropped while we were processing it } } } diff --git a/orkaudio/messages/TapeMsg.h b/orkaudio/messages/TapeMsg.h index 5365e02..81f5e3e 100644 --- a/orkaudio/messages/TapeMsg.h +++ b/orkaudio/messages/TapeMsg.h @@ -15,7 +15,7 @@ #define __TAPEMSG_H__ #include "messages/SyncMessage.h" -#include "messages/ASyncMessage.h" +#include "messages/AsyncMessage.h" #include "AudioTape.h" #define TAPE_MESSAGE_NAME "tape" |