X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8a586e08eef0a5d09612f26f0e0c687cfac9963..2831eb2dd5694a783d2a6ddf476d0695407c121a:/src/unix/sound.cpp?ds=inline diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp index 3ac2ea8462..3871409e7e 100644 --- a/src/unix/sound.cpp +++ b/src/unix/sound.cpp @@ -413,7 +413,7 @@ bool wxSoundSyncOnlyAdaptor::IsPlaying() const #if wxUSE_THREADS return m_status.m_playing; #else - return FALSE; + return false; #endif } @@ -465,7 +465,11 @@ bool wxSound::Create(const wxString& fileName, bool isResource) return false; } - wxFileOffset len = fileWave.Length(); + wxFileOffset lenOrig = fileWave.Length(); + if ( lenOrig == wxInvalidOffset ) + return false; + + size_t len = wx_truncate_cast(size_t, lenOrig); wxUint8 *data = new wxUint8[len]; if (fileWave.Read(data, len) != len) { @@ -620,7 +624,6 @@ typedef struct wxUint16 uiBitsPerSample; } WAVEFORMAT; -#define MONO 1 // and stereo is 2 by wav format #define WAVE_FORMAT_PCM 1 #define WAVE_INDEX 8 #define FMT_INDEX 12