diff options
| author | Henri Herscher <henri@oreka.org> | 2006-10-19 20:58:07 +0000 |
|---|---|---|
| committer | Henri Herscher <henri@oreka.org> | 2006-10-19 20:58:07 +0000 |
| commit | caceb9467cf04f5022848b807f5035162d57088a (patch) | |
| tree | bd2920086669d99d23181f2b2f7d967257b68fec /orkbasecxx | |
| parent | fab520dc3e7af0aca405cd469bb2434c7f22cf6b (diff) | |
Added a tape ready message that is emitted to orktrack when a tape has been transcoded and is ready for replay. Tape stop message is now sent when the capture has ended.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@346 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx')
| -rw-r--r-- | orkbasecxx/AudioCapture.cpp | 6 | ||||
| -rw-r--r-- | orkbasecxx/AudioCapture.h | 4 | ||||
| -rw-r--r-- | orkbasecxx/AudioTape.cpp | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/orkbasecxx/AudioCapture.cpp b/orkbasecxx/AudioCapture.cpp index 93830c7..87461ac 100644 --- a/orkbasecxx/AudioCapture.cpp +++ b/orkbasecxx/AudioCapture.cpp @@ -237,6 +237,8 @@ CStdString CaptureEvent::EventTypeToString(int eventTypeEnum) return ET_ORKUID; case EtEndMetadata: return ET_ENDMETADATA; + case EtReady: + return ET_READY; } return ET_INVALID; } @@ -296,6 +298,10 @@ int CaptureEvent::EventTypeToEnum(CStdString& eventTypeString) { eventTypeEnum = EtEndMetadata; } + else if (eventTypeString.CompareNoCase(ET_READY) == 0) + { + eventTypeEnum = EtReady; + } return eventTypeEnum; } diff --git a/orkbasecxx/AudioCapture.h b/orkbasecxx/AudioCapture.h index 6c257ba..35734e5 100644 --- a/orkbasecxx/AudioCapture.h +++ b/orkbasecxx/AudioCapture.h @@ -122,6 +122,7 @@ public: #define ET_REMOTEMAC "remotemac" #define ET_ORKUID "orkuid" #define ET_ENDMETADATA "endmetadata" +#define ET_READY "ready" #define ET_INVALID "invalid" typedef enum { @@ -139,7 +140,8 @@ public: EtRemoteMac = 11, EtOrkUid = 12, EtEndMetadata = 13, - EtInvalid = 14 + EtReady = 14, + EtInvalid = 15 } EventTypeEnum; static CStdString EventTypeToString(int eventTypeEnum); static int EventTypeToEnum(CStdString&); diff --git a/orkbasecxx/AudioTape.cpp b/orkbasecxx/AudioTape.cpp index 30cd9ef..ad6b95c 100644 --- a/orkbasecxx/AudioTape.cpp +++ b/orkbasecxx/AudioTape.cpp @@ -292,7 +292,7 @@ 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) + if(captureEventRef->m_type == CaptureEvent::EtStop || captureEventRef->m_type == CaptureEvent::EtStart || captureEventRef->m_type == CaptureEvent::EtReady) { pTapeMsg->m_recId = m_fileIdentifier; pTapeMsg->m_fileName = m_filePath + m_fileIdentifier + m_fileExtension; |