Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

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

diff --git a/contrib/src/mmedia/sndcpcm.cpp b/contrib/src/mmedia/sndcpcm.cpp
index 3eddf09eb2098ce70848dd0922c60f511c5573ee..3e922ba39261f1c0f05fd228946822ef7f0f5539 100644 (file)
--- a/contrib/src/mmedia/sndcpcm.cpp
+++ b/contrib/src/mmedia/sndcpcm.cpp
@@ -51,7 +51,7 @@ wxUint32 wxSoundStreamPcm::GetBestSize() const
 // -----------------------------------------------------------------------
 
 #define DEFINE_CONV(name, input_type, output_type, convert) \
-static void Convert_##name##(const void *buf_in, void *buf_out, wxUint32 len) \
+static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len) \
 {\
   register input_type src; \
   register const input_type *t_buf_in = (input_type *)buf_in; \
@@ -379,11 +379,15 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
     // We try to minimize the need of dynamic memory allocation by preallocating a buffer. But
     // to be sure it will be efficient we minimize the best size.
     if (m_multiplier_in < m_multiplier_out) {
-        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() * m_multiplier_out);
-        m_best_size = (wxUint32)(m_sndio->GetBestSize() * m_multiplier_in);
+        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
+                                      m_multiplier_out);
+        m_best_size = (wxUint32)(m_sndio->GetBestSize() *
+                                 m_multiplier_in);
     } else {
-        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() * m_multiplier_in);
-        m_best_size = (wxUint32)(m_sndio->GetBestSize() * m_multiplier_out);
+        m_prebuffer_size = (wxUint32)(m_sndio->GetBestSize() *
+                                      m_multiplier_in);
+        m_best_size = (wxUint32)(m_sndio->GetBestSize() *
+                                 m_multiplier_out);
     }
     
     m_prebuffer = new char[m_prebuffer_size];
@@ -392,6 +396,7 @@ bool wxSoundStreamPcm::SetSoundFormat(const wxSoundFormatBase& format)
 
     SetSoundFormatReturn = m_sndio->SetSoundFormat(*new_format);
     wxASSERT( SetSoundFormatReturn );
+    wxUnusedVar( SetSoundFormatReturn );
     
     m_sndformat = new_format;
     return TRUE;