and restored error checking too: this completes sequence of 3 check ins making wx...

[wxWidgets.git] / contrib / src / mmedia / sndwav.cpp

diff --git a/contrib/src/mmedia/sndwav.cpp b/contrib/src/mmedia/sndwav.cpp
index 75f5bf9e59fd17f89caf36a2804f9ac08d08f202..c854f774efdd369f6a117cdfd84ba09e8391ff5c 100644 (file)
--- a/contrib/src/mmedia/sndwav.cpp
+++ b/contrib/src/mmedia/sndwav.cpp
@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
+// wxWindows licence
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndwav.cpp"
@@ -64,7 +65,7 @@ wxString wxSoundWave::GetCodecName() const
     return wxString(wxT("wxSoundWave codec"));
 }
 
-#define FAIL_WITH(condition, err) if (condition) { m_snderror = err; return FALSE; }
+#define FAIL_WITH(condition, err) if (condition) { m_snderror = err; return false; }
 
 bool wxSoundWave::CanRead()
 {
@@ -77,7 +78,7 @@ bool wxSoundWave::CanRead()
     
     if (wxUINT32_SWAP_ON_BE(signature1) != RIFF_SIGNATURE) {
         m_input->Ungetch(&signature1, 4);
-        return FALSE;
+        return false;
     }
 
     // Pass the global length
@@ -93,9 +94,9 @@ bool wxSoundWave::CanRead()
 
     // Test the second signature
     if (wxUINT32_SWAP_ON_BE(signature2) != WAVE_SIGNATURE)
-        return FALSE;
+        return false;
     
-    return TRUE;
+    return true;
 }
 
 bool wxSoundWave::HandleOutputPCM(wxDataInputStream& WXUNUSED(data), wxUint32 len,
@@ -108,15 +109,15 @@ bool wxSoundWave::HandleOutputPCM(wxDataInputStream& WXUNUSED(data), wxUint32 le
     sndformat.SetSampleRate(sample_fq);
     sndformat.SetBPS(bits_p_spl);
     sndformat.SetChannels(channels);
-    sndformat.Signed(TRUE);
+    sndformat.Signed(true);
     sndformat.SetOrder(wxLITTLE_ENDIAN);
     
     if (!SetSoundFormat(sndformat))
-        return FALSE;
+        return false;
     
     m_input->SeekI(len, wxFromCurrent);
 
-    return TRUE;
+    return true;
 }
 
 bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
@@ -150,13 +151,13 @@ bool wxSoundWave::HandleOutputMSADPCM(wxDataInputStream& data, wxUint32 len,
     delete[] coefs[1];
     
     if (!SetSoundFormat(sndformat))
-        return FALSE;
+        return false;
 
     len -= coefs_len*4 + 4;
     
     m_input->SeekI(len, wxFromCurrent);
     
-    return TRUE;
+    return true;
 }
 
 bool wxSoundWave::HandleOutputG721(wxDataInputStream& WXUNUSED(data), wxUint32 len,
@@ -170,11 +171,11 @@ bool wxSoundWave::HandleOutputG721(wxDataInputStream& WXUNUSED(data), wxUint32 l
     sndformat.SetG72XType(wxSOUND_G721);
     
     if (!SetSoundFormat(sndformat))
-        return FALSE;
+        return false;
     
     m_input->SeekI(len, wxFromCurrent);
 
-    return TRUE;
+    return true;
 }
 
 bool wxSoundWave::PrepareToPlay()
@@ -184,11 +185,11 @@ bool wxSoundWave::PrepareToPlay()
     
     if (!m_input) {
         m_snderror = wxSOUND_INVSTRM;
-        return FALSE;
+        return false;
     }
     
     wxDataInputStream data(*m_input);
-    data.BigEndianOrdered(FALSE);
+    data.BigEndianOrdered(false);
 
     // Get the first signature
     FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
@@ -205,7 +206,7 @@ bool wxSoundWave::PrepareToPlay()
     FAIL_WITH(wxUINT32_SWAP_ON_BE(signature) != WAVE_SIGNATURE, wxSOUND_INVSTRM);
     // "WAVE"
     
-    end_headers = FALSE;
+    end_headers = false;
     // Chunk loop
     while (!end_headers) {
         FAIL_WITH(m_input->Read(&signature, 4).LastRead() != 4, wxSOUND_INVSTRM);
@@ -228,31 +229,31 @@ bool wxSoundWave::PrepareToPlay()
                         if (!HandleOutputPCM(data, len, channels, sample_fq,
                                              byte_p_sec, byte_p_spl,
                                              bits_p_spl))
-                            return FALSE;
+                            return false;
                         break;
                     case 0x02: // MS ADPCM
                         if (!HandleOutputMSADPCM(data, len,
                                                  channels, sample_fq,
                                                  byte_p_sec, byte_p_spl,
                                                  bits_p_spl))
-                            return FALSE;
+                            return false;
                         break;
                     case 0x40: // G721
                         if (!HandleOutputG721(data, len,
                                               channels, sample_fq,
                                               byte_p_sec, byte_p_spl,
                                               bits_p_spl))
-                            return FALSE;
+                            return false;
                         break;
                     default: 
                         m_snderror = wxSOUND_NOCODEC;
-                        return FALSE;
+                        return false;
                 }
                 break;
             }
             case DATA_SIGNATURE: // "data"
                 m_base_offset = m_input->TellI();
-                end_headers = TRUE;
+                end_headers = true;
                 FinishPreparation(len);
                 break;
             default:
@@ -261,7 +262,7 @@ bool wxSoundWave::PrepareToPlay()
                 break;
         }
     }
-    return TRUE;
+    return true;
 }
 
 wxSoundFormatBase *wxSoundWave::HandleInputPCM(wxDataOutputStream& data)
@@ -282,7 +283,7 @@ wxSoundFormatBase *wxSoundWave::HandleInputPCM(wxDataOutputStream& data)
     byte_p_sec = pcm->GetBytesFromTime(1);
     format     = 0x01;
     
-    pcm->Signed(TRUE);
+    pcm->Signed(true);
     pcm->SetOrder(wxLITTLE_ENDIAN);
     
     data << format << channels << sample_fq
@@ -330,14 +331,14 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
     
     if (!m_output) {
         m_snderror = wxSOUND_INVSTRM;
-        return FALSE;
+        return false;
     }
     
     wxDataOutputStream data(*m_output);
     wxDataOutputStream fmt_d_data(fmt_data);
     
-    data.BigEndianOrdered(FALSE);
-    fmt_d_data.BigEndianOrdered(FALSE);
+    data.BigEndianOrdered(false);
+    fmt_d_data.BigEndianOrdered(false);
     
     WRITE_SIGNATURE(m_output, RIFF_SIGNATURE);
     
@@ -359,20 +360,20 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
                 break;
             default:
                 m_snderror = wxSOUND_NOCODEC;
-                return FALSE;
+                return false;
         }
         
         FAIL_WITH(!frmt, wxSOUND_NOCODEC);
         
         if (!SetSoundFormat(*frmt)) {
             delete frmt;
-            return FALSE;
+            return false;
         }
         
         delete frmt;
     }
     
-    data << (fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
+    data << (wxUint32)(fmt_data.GetSize() + m_sndformat->GetBytesFromTime(time));
 
     // We, finally, copy the header block to the output stream 
     {
@@ -387,28 +388,28 @@ FAIL_WITH(s->Write(&signature, 4).LastWrite() != 4, wxSOUND_INVSTRM);
     
     WRITE_SIGNATURE(m_output, DATA_SIGNATURE);
     data.Write32(m_sndformat->GetBytesFromTime(time));
-    return TRUE;
+    return true;
 }
 
 bool wxSoundWave::FinishRecording()
 {
     if (m_output->SeekO(0, wxFromStart) == wxInvalidOffset)
         // We can't but there is no error.
-        return TRUE;
+        return true;
     
     if (m_bytes_left == 0)
-        return TRUE;
+        return true;
     
     // TODO: Update headers when we stop before the specified time (if possible)
-    return TRUE;
+    return true;
 }
 
 bool wxSoundWave::RepositionStream(wxUint32 WXUNUSED(position))
 {
     if (m_base_offset == wxInvalidOffset)
-        return FALSE;
+        return false;
     m_input->SeekI(m_base_offset, wxFromStart);
-    return TRUE;
+    return true;
 }
 
 wxUint32 wxSoundWave::GetData(void *buffer, wxUint32 len)