Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change wxSound ctor from in-memory data to use size_t/void *.

Browse Source 
This constructor previously used int and, especially annoyingly, wxByte* for
the data. Use standard void* for untyped binary data instead.

Also document this ctor as it seems to be implemented in all ports.

Closes #13451.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69178 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-09-21 15:08:02 +00:00
parent 7ed24cb652
commit c559c4b3ef
14 changed files with 42 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/os2/sound.cpp
View File

@@ -42,7 +42,7 @@ wxSound::wxSound(const wxString& sFileName, bool isResource)
Create(sFileName, isResource);
}
wxSound::wxSound(int size, const wxByte* data)
wxSound::wxSound(size_t size, const void* data)
: m_waveData(NULL), m_waveLength(0), m_isResource(FALSE)
{
Create(size, data);
@@ -108,7 +108,7 @@ bool wxSound::Create(const wxString& fileName, bool isResource)
}
}
bool wxSound::Create(int size, const wxByte* data)
bool wxSound::Create(size_t size, const void* data)
{
Free();
m_isResource = FALSE;
@@ -117,7 +117,7 @@ bool wxSound::Create(int size, const wxByte* data)
if (!m_waveData)
return FALSE;
for (int i=0; i<size; i++) m_waveData[i] = data[i];
memcpy(m_waveData, data, size);
return TRUE;
}