fix evaluation order bug (patch 1158099)

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

diff --git a/contrib/src/mmedia/sndg72x.cpp b/contrib/src/mmedia/sndg72x.cpp
index 91245524b92684ebeddb10227546dae78825f80e..46e502bc22a119704c8dd49d5f3f977709b5b66d 100644 (file)
--- a/contrib/src/mmedia/sndg72x.cpp
+++ b/contrib/src/mmedia/sndg72x.cpp
@@ -4,12 +4,13 @@
 // Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$
 // Date: 08/26/1999
 // Author: Guilhem Lavaux <lavaux@easynet.fr> (C) 1999
 // CVSID: $Id$

+// wxWindows licence

 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndg72x.cpp"
 #endif
 
 // --------------------------------------------------------------------------
 #ifdef __GNUG__
 #pragma implementation "sndg72x.cpp"
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"
 
 #ifndef WX_PRECOMP
     #include "wx/defs.h"


@@ -104,7 +105,7 @@ bool wxSoundFormatG72X::operator !=(const wxSoundFormatBase& frmt2) const
     wxSoundFormatG72X *g72x = (wxSoundFormatG72X *)&frmt2;
     
     if (frmt2.GetType() != wxSOUND_G72X)
     wxSoundFormatG72X *g72x = (wxSoundFormatG72X *)&frmt2;
     
     if (frmt2.GetType() != wxSOUND_G72X)

-        return TRUE;
+        return true;

     
     return (g72x->m_srate != m_srate || g72x->m_g72x_type != m_g72x_type);
 }
     
     return (g72x->m_srate != m_srate || g72x->m_g72x_type != m_g72x_type);
 }


@@ -196,7 +197,7 @@ bool wxSoundStreamG72X::SetSoundFormat(const wxSoundFormatBase& format)
 {
     if (format.GetType() != wxSOUND_G72X) {
         m_snderror = wxSOUND_INVFRMT;
 {
     if (format.GetType() != wxSOUND_G72X) {
         m_snderror = wxSOUND_INVFRMT;

-        return FALSE;
+        return false;

     }
     
     wxSoundFormatPcm pcm;
     }
     
     wxSoundFormatPcm pcm;


@@ -210,7 +211,7 @@ bool wxSoundStreamG72X::SetSoundFormat(const wxSoundFormatBase& format)
     pcm.SetSampleRate(g72x->GetSampleRate());
     pcm.SetBPS(16);
     pcm.SetChannels(1); // Only mono supported
     pcm.SetSampleRate(g72x->GetSampleRate());
     pcm.SetBPS(16);
     pcm.SetChannels(1); // Only mono supported

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

     pcm.SetOrder(wxBYTE_ORDER);
 
     // Look for the correct codec to use and set its bit width
     pcm.SetOrder(wxBYTE_ORDER);
 
     // Look for the correct codec to use and set its bit width


@@ -235,7 +236,7 @@ bool wxSoundStreamG72X::SetSoundFormat(const wxSoundFormatBase& format)
     // Let the router finish the work
     m_router->SetSoundFormat(pcm);
     
     // Let the router finish the work
     m_router->SetSoundFormat(pcm);
     

-    return TRUE;
+    return true;

 }
 
 #define BYTE_SIZE 8
 }
 
 #define BYTE_SIZE 8