diff options
| author | Tzafrir Cohen <tzafrir@cohens.org.il> | 2009-09-17 21:26:22 +0300 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir@cohens.org.il> | 2009-10-04 10:48:39 +0200 |
| commit | 30d52bc6e985b84be8543219dcef0cf1a9a5f426 (patch) | |
| tree | 56ce8a0e0a9eea0ef4471f8227f2b8bb3afb3873 /orkbasecxx/audiofile | |
| parent | 2beb76edfb910062faa47e0c30bb9ab9f9c1c4ec (diff) | |
fix most warnings in orkbasecxx
Fixed instances of:
* Unused variables
* signed/unsigned comparisons
* Use some more 'const'
* Disabled '#pragma warning'
Diffstat (limited to 'orkbasecxx/audiofile')
| -rw-r--r-- | orkbasecxx/audiofile/AudioFile.h | 2 | ||||
| -rw-r--r-- | orkbasecxx/audiofile/MediaChunkFile.cpp | 8 | ||||
| -rw-r--r-- | orkbasecxx/audiofile/PcmFile.cpp | 2 |
3 files changed, 5 insertions, 7 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..ebb1822 100644 --- a/orkbasecxx/audiofile/MediaChunkFile.cpp +++ b/orkbasecxx/audiofile/MediaChunkFile.cpp @@ -10,7 +10,7 @@ * Please refer to http://www.gnu.org/copyleft/gpl.html * */ -#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning +//#pragma warning( disable: 4786 ) // disables truncated symbols in browse-info warning #include "ConfigManager.h" #include "MediaChunkFile.h" @@ -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); } |