diff options
author | beg_g <beg_g@09dcff7a-b715-0410-9601-b79a96267cd0> | 2009-10-22 18:36:21 +0000 |
---|---|---|
committer | beg_g <beg_g@09dcff7a-b715-0410-9601-b79a96267cd0> | 2009-10-22 18:36:21 +0000 |
commit | 431b8771bce2f011e570f32c6d21642394e356a2 (patch) | |
tree | bc45730fae26ae2fe31efd96f7f86123a6d219ce /orkbasecxx/audiofile | |
parent | 870ec66dd107c077d85e12917ccf17ae3c511548 (diff) |
Multiple corrections to code to suppress gcc warnings - identified by Tzafrir Cohen.
git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@649 09dcff7a-b715-0410-9601-b79a96267cd0
Diffstat (limited to 'orkbasecxx/audiofile')
-rw-r--r-- | orkbasecxx/audiofile/AudioFile.h | 2 | ||||
-rw-r--r-- | orkbasecxx/audiofile/MediaChunkFile.cpp | 6 | ||||
-rw-r--r-- | orkbasecxx/audiofile/PcmFile.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/orkbasecxx/audiofile/AudioFile.h b/orkbasecxx/audiofile/AudioFile.h index cc37e4c..ce54385 100644 --- a/orkbasecxx/audiofile/AudioFile.h +++ b/orkbasecxx/audiofile/AudioFile.h @@ -41,7 +41,7 @@ public: /** Writes a chunk of audio to disk. If stereo capture, this represents the local party */ virtual void WriteChunk(AudioChunkRef chunkRef) = 0; - /** Writes a chunk of audio from the remote pary to disk (if stereo capture) + /** Writes a chunk of audio from the remote pary to disk (if stereo capture) */ //virtual bool WriteRemoteChunk(AudioChunkRef chunkRef) = 0; /** Reads a chunk of audio stereo-wise If underlying storage is mono, remoteChunk will be NULL diff --git a/orkbasecxx/audiofile/MediaChunkFile.cpp b/orkbasecxx/audiofile/MediaChunkFile.cpp index 3856be5..1e9d6a3 100644 --- a/orkbasecxx/audiofile/MediaChunkFile.cpp +++ b/orkbasecxx/audiofile/MediaChunkFile.cpp @@ -61,8 +61,7 @@ bool MediaChunkFile::FlushToDisk() continue; } - int tmp = sizeof(AudioChunkDetails); - unsigned int numWritten = ACE_OS::fwrite(tmpChunk->GetDetails(), sizeof(AudioChunkDetails), 1, m_stream); + int numWritten = ACE_OS::fwrite(tmpChunk->GetDetails(), sizeof(AudioChunkDetails), 1, m_stream); if(numWritten != 1) { writeError = true; @@ -97,7 +96,7 @@ void MediaChunkFile::WriteChunk(AudioChunkRef chunkRef) m_chunkQueueDataSize += pChunk->GetNumBytes(); m_chunkQueue.push(chunkRef); - if(m_chunkQueueDataSize > (CONFIG.m_captureFileBatchSizeKByte*1024)) + if(m_chunkQueueDataSize > (unsigned int)(CONFIG.m_captureFileBatchSizeKByte*1024)) { if (m_stream) { @@ -117,7 +116,6 @@ void MediaChunkFile::WriteChunk(AudioChunkRef chunkRef) int MediaChunkFile::ReadChunkMono(AudioChunkRef& chunkRef) { unsigned int numRead = 0; - bool readError = false; if (m_stream) { diff --git a/orkbasecxx/audiofile/PcmFile.cpp b/orkbasecxx/audiofile/PcmFile.cpp index 85f49e3..c6ba65c 100644 --- a/orkbasecxx/audiofile/PcmFile.cpp +++ b/orkbasecxx/audiofile/PcmFile.cpp @@ -59,7 +59,7 @@ void PcmFile::WriteChunk(AudioChunkRef chunkRef) throw(CStdString("Write attempt on unopened file:")+ m_filename); } - if (numWritten != chunkRef->GetNumSamples()) + if (numWritten != (unsigned int)chunkRef->GetNumSamples()) { throw(CStdString("Could not write to file:")+ m_filename); } |