X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c42b1de68a5d4b48c00092d9996574bfb8d8a542..209f3e1453dd576919bf1cc8f696218dae23c34b:/contrib/src/mmedia/sndmsad.cpp diff --git a/contrib/src/mmedia/sndmsad.cpp b/contrib/src/mmedia/sndmsad.cpp index 81068016fc..30181b0aac 100644 --- a/contrib/src/mmedia/sndmsad.cpp +++ b/contrib/src/mmedia/sndmsad.cpp @@ -4,12 +4,13 @@ // Date: 08/11/1999 // Author: Guilhem Lavaux (C) 1999 // CVSID: $Id$ +// wxWindows licence // -------------------------------------------------------------------------- #ifdef __GNUG__ #pragma implementation "sndmsad.cpp" #endif -#include +#include "wx/wxprec.h" #ifndef WX_PRECOMP #include "wx/defs.h" @@ -66,7 +67,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 +78,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;im_srate != m_srate) && (adpcm->m_nchannels != m_nchannels); } @@ -143,8 +144,8 @@ wxSoundStreamMSAdpcm::wxSoundStreamMSAdpcm(wxSoundStream& sndio) { // PCM converter m_router = new wxSoundRouterStream(sndio); - m_got_header = FALSE; - m_stereo = FALSE; + m_got_header = false; + m_stereo = false; } wxSoundStreamMSAdpcm::~wxSoundStreamMSAdpcm() @@ -152,7 +153,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; @@ -354,7 +355,7 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format) { if (format.GetType() != wxSOUND_MSADPCM) { m_snderror = wxSOUND_INVFRMT; - return FALSE; + return false; } wxSoundFormatPcm pcm; @@ -368,15 +369,14 @@ 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__); - return FALSE; + wxLogError(wxT("Number of ADPCM coefficients must be non null")); + return false; } pcm.SetSampleRate(adpcm->GetSampleRate()); pcm.SetBPS(16); pcm.SetChannels(adpcm->GetChannels()); - pcm.Signed(TRUE); + pcm.Signed(true); pcm.SetOrder(wxBYTE_ORDER); m_stereo = (adpcm->GetChannels() == 2); @@ -385,6 +385,6 @@ bool wxSoundStreamMSAdpcm::SetSoundFormat(const wxSoundFormatBase& format) m_router->SetSoundFormat(pcm); - return TRUE; + return true; }