removed weird comparison of m_oldFont with -1 (this doesn't compile with SGI CC in...

[wxWidgets.git] / src / unix / sound.cpp

diff --git a/src/unix/sound.cpp b/src/unix/sound.cpp
index 3ac2ea84629a81cf530e22f8e543c92e52d7c5af..3871409e7ee0c944e9b269d19d5aa38c8879fdad 100644 (file)
--- 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