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

Only MSW supports loading sounds from data.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59518 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2009-03-13 21:02:13 +00:00
parent ab9df4fb45
commit e2c33b5595
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
samples/sound/sound.cpp
View File

@@ -194,8 +194,9 @@ MyFrame::MyFrame(const wxString& title)
menuFile->Append(Sound_SelectFile, _T("Select WAV &file...\tCtrl-O"), _T("Select a new wav file to play")); menuFile->Append(Sound_SelectFile, _T("Select WAV &file...\tCtrl-O"), _T("Select a new wav file to play"));
#ifdef __WXMSW__ #ifdef __WXMSW__
menuFile->Append(Sound_SelectResource, _T("Select WAV &resource...\tCtrl-R"), _T("Select a new resource to play")); menuFile->Append(Sound_SelectResource, _T("Select WAV &resource...\tCtrl-R"), _T("Select a new resource to play"));
#endif // __WXMSW__
menuFile->Append(Sound_SelectMemory, _T("Select WAV &data\tCtrl-M"), _T("Choose to play from memory buffer")); menuFile->Append(Sound_SelectMemory, _T("Select WAV &data\tCtrl-M"), _T("Choose to play from memory buffer"));
#endif // __WXMSW__
menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program")); menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
wxMenu *playMenu = new wxMenu; wxMenu *playMenu = new wxMenu;
@@ -227,6 +228,7 @@ MyFrame::MyFrame(const wxString& title)
bool MyFrame::CreateSound(wxSound& snd) const bool MyFrame::CreateSound(wxSound& snd) const
{ {
#ifdef __WXMSW__
if ( m_useMemory ) if ( m_useMemory )
{ {
// this is the dump of cuckoo.wav // this is the dump of cuckoo.wav
@@ -960,7 +962,6 @@ bool MyFrame::CreateSound(wxSound& snd) const
return snd.Create(sizeof(data), data); return snd.Create(sizeof(data), data);
} }
#ifdef __WXMSW__
if ( !m_soundRes.empty() ) if ( !m_soundRes.empty() )
{ {
return snd.Create(m_soundRes, true); return snd.Create(m_soundRes, true);