Warning fixes, source cleaning.

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

diff --git a/contrib/src/mmedia/sndbase.cpp b/contrib/src/mmedia/sndbase.cpp
index 88e638d5d8a4474ea1a8e0946a3048d65a667ac5..d0c96431da5eb27919e29103c34ea8a9dc756960 100644 (file)
--- a/contrib/src/mmedia/sndbase.cpp
+++ b/contrib/src/mmedia/sndbase.cpp
@@ -9,7 +9,14 @@
 #pragma implementation "sndbase.cpp"
 #endif
 
 #pragma implementation "sndbase.cpp"
 #endif
 

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+#include "wx/defs.h"
+#include "wx/string.h"
+#include "wx/log.h"
+#endif
+

 #include "wx/mmedia/sndbase.h"
 
 
 #include "wx/mmedia/sndbase.h"
 
 


@@ -27,12 +34,14 @@ wxSoundFormatBase::~wxSoundFormatBase()
 
 wxSoundFormatBase *wxSoundFormatBase::Clone() const
 {
 
 wxSoundFormatBase *wxSoundFormatBase::Clone() const
 {

-  return NULL;
+    wxLogFatalError(wxT("In wxSoundFormatBase::Clone() but I should")
+                    wxT(" not be there"));
+    return NULL;

 }
 
 bool wxSoundFormatBase::operator!=(const wxSoundFormatBase& frmt2) const
 {
 }
 
 bool wxSoundFormatBase::operator!=(const wxSoundFormatBase& frmt2) const
 {

-  return (GetType() != frmt2.GetType());
+    return (GetType() != frmt2.GetType());

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------


@@ -41,21 +50,21 @@ bool wxSoundFormatBase::operator!=(const wxSoundFormatBase& frmt2) const
 
 wxSoundStream::wxSoundStream()
 {
 
 wxSoundStream::wxSoundStream()
 {

-  int i;
-
-  // Reset all variables to their neutral value.
-  m_sndformat = NULL;
-  m_handler = NULL;
-  m_snderror = wxSOUND_NOERROR;
-  m_lastcount = 0;
-  for (i=0;i<2;i++)
-    m_callback[i] = NULL;
+    int i;
+    
+    // Reset all variables to their neutral value.
+    m_sndformat = NULL;
+    m_handler = NULL;
+    m_snderror = wxSOUND_NOERROR;
+    m_lastcount = 0;
+    for (i=0;i<2;i++)
+        m_callback[i] = NULL;

 }
 
 wxSoundStream::~wxSoundStream()
 {
   if (m_sndformat)
 }
 
 wxSoundStream::~wxSoundStream()
 {
   if (m_sndformat)

-    delete m_sndformat;
+      delete m_sndformat;

 }
 
 // --------------------------------------------------------------------------
 }
 
 // --------------------------------------------------------------------------


@@ -63,19 +72,19 @@ wxSoundStream::~wxSoundStream()
 // important function of the wxSoundStream class. It prepares the stream to
 // receive or send the data in a strict format. Normally, the sound stream
 // should be ready to accept any format it is asked to manage but in certain
 // important function of the wxSoundStream class. It prepares the stream to
 // receive or send the data in a strict format. Normally, the sound stream
 // should be ready to accept any format it is asked to manage but in certain

-// cases, it really cannot: in that case it returns FALSE. To have more
+// cases, it really cannot: in that case it returns false. To have more

 // details in the functionnalities of SetSoundFormat see
 // wxSoundRouterStream::SetSoundFormat()
 // --------------------------------------------------------------------------
 bool wxSoundStream::SetSoundFormat(const wxSoundFormatBase& format)
 {
 // details in the functionnalities of SetSoundFormat see
 // wxSoundRouterStream::SetSoundFormat()
 // --------------------------------------------------------------------------
 bool wxSoundStream::SetSoundFormat(const wxSoundFormatBase& format)
 {

-  // delete the previous prepared format
-  if (m_sndformat)
-    delete m_sndformat;
-
-  // create a new one by cloning the format passed in parameter
-  m_sndformat = format.Clone();
-  return TRUE;
+    // delete the previous prepared format
+    if (m_sndformat)
+      delete m_sndformat;
+    
+    // create a new one by cloning the format passed in parameter
+    m_sndformat = format.Clone();
+    return true;

 }
 
 
 }