X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2749089a332d27b5bad583e4f4cb213651040e4f..268766dd1f2a2d4d593d1d65893f62b5753ff20b:/src/gtk1/wave.cpp diff --git a/src/gtk1/wave.cpp b/src/gtk1/wave.cpp index 80a679ebb8..382c1db09b 100644 --- a/src/gtk1/wave.cpp +++ b/src/gtk1/wave.cpp @@ -13,7 +13,7 @@ #pragma implementation "wave.h" #endif -#include +#include "wx/setup.h" #if wxUSE_WAVE @@ -169,7 +169,6 @@ typedef struct int wxWave::OpenDSP(void) { - wxString str; WAVEFORMAT waveformat; int dev=-1; unsigned long ul; @@ -179,14 +178,14 @@ int wxWave::OpenDSP(void) memcpy(&waveformat,&m_waveData[FMT_INDEX+4],sizeof(WAVEFORMAT)); - str= wxString(m_waveData,4); - if (str != "RIFF") return -1; - str= wxString(&m_waveData[WAVE_INDEX],4); - if (str != "WAVE") return -1; - str= wxString(&m_waveData[FMT_INDEX],4); - if (str != "fmt ") return -1; - str= wxString(&m_waveData[FMT_INDEX+waveformat.uiSize+8],4); - if(str != "data") return -1; + if (memcmp(m_waveData, "RIFF", 4) != 0) + return -1; + if (memcmp(&m_waveData[WAVE_INDEX], "WAVE", 4) != 0) + return -1; + if (memcmp(&m_waveData[FMT_INDEX], "fmt ", 4) != 0) + return -1; + if (memcmp(&m_waveData[FMT_INDEX+waveformat.uiSize+8], "data", 4) != 0) + return -1; memcpy(&ul,&m_waveData[FMT_INDEX+waveformat.uiSize+12],4); m_sizeData=ul; if ((int)(m_sizeData+FMT_INDEX+waveformat.uiSize+16) != m_waveLength)