fix evaluation order bug (patch 1158099)

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

diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index dbc6505d5bf409262a2b6dd247b91468bba73d2c..30181b0aac0c6cad56f59e46aae2c9bee3200ed5 100644 (file)
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -4,6 +4,7 @@
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
 // Date: 08/11/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$

+// wxWindows licence

 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndmsad.cpp"
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndmsad.cpp"


@@ -66,7 +67,7 @@ wxUint16 wxSoundFormatMSAdpcm::GetChannels() const
     return m_nchannels; 
 }
 
     return m_nchannels; 
 }
 

-void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **coefs, wxUint16 ncoefs,
+void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **WXUNUSED(coefs), wxUint16 ncoefs,

                                     wxUint16 coefs_len)
 {
     wxUint16 i;
                                     wxUint16 coefs_len)
 {
     wxUint16 i;


@@ -130,7 +131,7 @@ bool wxSoundFormatMSAdpcm::operator !=(const wxSoundFormatBase& frmt2) const
     const wxSoundFormatMSAdpcm *adpcm = (const wxSoundFormatMSAdpcm *)&frmt2;
     
     if (frmt2.GetType() != wxSOUND_MSADPCM)
     const wxSoundFormatMSAdpcm *adpcm = (const wxSoundFormatMSAdpcm *)&frmt2;
     
     if (frmt2.GetType() != wxSOUND_MSADPCM)

-        return TRUE;
+        return true;

     
     return (adpcm->m_srate != m_srate) && (adpcm->m_nchannels != m_nchannels);
 }
     
     return (adpcm->m_srate != m_srate) && (adpcm->m_nchannels != m_nchannels);
 }


@@ -143,8 +144,8 @@ wxSoundStreamMSAdpcm::wxSoundStreamMSAdpcm(wxSoundStream& sndio)
 {
     // PCM converter
     m_router     = new wxSoundRouterStream(sndio);
 {
     // PCM converter
     m_router     = new wxSoundRouterStream(sndio);

-    m_got_header = FALSE;
-    m_stereo = FALSE;
+    m_got_header = false;
+    m_stereo = false;

 }
 
 wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()
 }
 
 wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()


@@ -152,7 +153,7 @@ wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()
     delete m_router;
 }
 
     delete m_router;
 }
 

-wxSoundStream& wxSoundStreamMSAdpcm::Read(void *buffer, wxUint32 len)
+wxSoundStream& wxSoundStreamMSAdpcm::Read(void *WXUNUSED(buffer), wxUint32 WXUNUSED(len))

 {
     m_snderror = wxSOUND_NOCODEC;
     m_lastcount = 0;
 {
     m_snderror = wxSOUND_NOCODEC;
     m_lastcount = 0;


@@ -354,7 +355,7 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
 {
     if (format.GetType() != wxSOUND_MSADPCM) {
         m_snderror = wxSOUND_INVFRMT;
 {
     if (format.GetType() != wxSOUND_MSADPCM) {
         m_snderror = wxSOUND_INVFRMT;

-        return FALSE;
+        return false;

     }
     
     wxSoundFormatPcm pcm;
     }
     
     wxSoundFormatPcm pcm;


@@ -368,15 +369,14 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
     adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
 
     if (!ncoefs) {
     adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
 
     if (!ncoefs) {

-        wxLogError(__FILE__ ":%d: Number of ADPCM coefficients"
-                   " must be non null", __LINE__);
-        return FALSE;
+        wxLogError(wxT("Number of ADPCM coefficients must be non null"));
+        return false;

     }
     
     pcm.SetSampleRate(adpcm->GetSampleRate());
     pcm.SetBPS(16);
     pcm.SetChannels(adpcm->GetChannels());
     }
     
     pcm.SetSampleRate(adpcm->GetSampleRate());
     pcm.SetBPS(16);
     pcm.SetChannels(adpcm->GetChannels());

-    pcm.Signed(TRUE);
+    pcm.Signed(true);

     pcm.SetOrder(wxBYTE_ORDER);
 
     m_stereo = (adpcm->GetChannels() == 2);
     pcm.SetOrder(wxBYTE_ORDER);
 
     m_stereo = (adpcm->GetChannels() == 2);


@@ -385,6 +385,6 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
     
     m_router->SetSoundFormat(pcm);
     
     
     m_router->SetSoundFormat(pcm);
     

-    return TRUE;
+    return true;

 }
 
 }