X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8482f24cfc00645607f8526fde38d39e0dcaa63..90c108964caba82a62602c7eef1268d4bb6e4841:/contrib/src/mmedia/sndcpcm.cpp diff --git a/contrib/src/mmedia/sndcpcm.cpp b/contrib/src/mmedia/sndcpcm.cpp index 3eddf09eb2..3e922ba392 100644 --- 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;