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

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

diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index 6024e8e4c173b429d38738e3c86ac20f5a76d5ab..3f627c63ed7ea7efbce6f9a7f5e022293f2f01b7 100644 (file)
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -66,7 +66,7 @@ wxUint16 wxSoundFormatMSAdpcm::GetChannels() const
     return m_nchannels; 
 }
 
-void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **coefs, wxUint16 ncoefs,
+void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **WXUNUSED(coefs), wxUint16 ncoefs,
                                     wxUint16 coefs_len)
 {
     wxUint16 i;
@@ -77,7 +77,7 @@ void wxSoundFormatMSAdpcm::SetCoefs(wxInt16 **coefs, wxUint16 ncoefs,
         delete[] m_coefs;
     }
     // TODO: Add some memory checking here
-    m_coefs = new (wxInt16 *)[ncoefs];
+    m_coefs = new wxInt16 *[ncoefs];
 
     for (i=0;i<ncoefs;i++)
        m_coefs[i] = new wxInt16[coefs_len];
@@ -152,7 +152,7 @@ wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm()
     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;
@@ -368,8 +368,7 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format)
     adpcm->GetCoefs(m_coefs, ncoefs, coefs_len);
 
     if (!ncoefs) {
-        wxLogError(__FILE__ ":%d: Number of ADPCM coefficients"
-                   " must be non null", __LINE__);
+        wxLogError(wxT("Number of ADPCM coefficients must be non null"));
         return FALSE;
     }