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/osx/carbon/sound.cpp
View File

@@ -188,7 +188,7 @@ class wxOSXQuickTimeSoundData : public wxSoundData
{
public:
wxOSXQuickTimeSoundData(const wxString& fileName);
wxOSXQuickTimeSoundData(int size, const wxByte* data);
wxOSXQuickTimeSoundData(size_t size, const void* data);
~wxOSXQuickTimeSoundData();
virtual bool Play(unsigned flags);
@@ -208,7 +208,7 @@ wxOSXQuickTimeSoundData::wxOSXQuickTimeSoundData(const wxString& fileName) :
m_sndname = fileName;
}
wxOSXQuickTimeSoundData::wxOSXQuickTimeSoundData(int size, const wxByte* data) :
wxOSXQuickTimeSoundData::wxOSXQuickTimeSoundData(size_t size, const void* data) :
m_movie(NULL)
{
m_soundHandle = NewHandleClear((Size)size);
@@ -354,7 +354,7 @@ void wxOSXQuickTimeSoundData::SoundTask()
MoviesTask(m_movie, MOVIE_DELAY); //Give QT time to play movie
}
bool wxSound::Create(int size, const wxByte* data)
bool wxSound::Create(size_t size, const void* data)
{
m_data = new wxOSXQuickTimeSoundData(size,data);
return true;