X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42b1de68a5d4b48c00092d9996574bfb8d8a542..90c108964caba82a62602c7eef1268d4bb6e4841:/contrib/src/mmedia/sndmsad.cpp?ds=inline

diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp
index 81068016fc..3f627c63ed 100644
--- a/contrib/src/mmedia/sndmsad.cpp
+++ b/contrib/src/mmedia/sndmsad.cpp
@@ -9,7 +9,7 @@
 #pragma implementation "sndmsad.cpp"
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #ifndef WX_PRECOMP
   #include "wx/defs.h"
@@ -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;
     }