Only MSW supports loading sounds from data.

[wxWidgets.git] / samples / sound / sound.cpp

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 4c4c869c8368bf26f32ed8a56f4f9269eb00b9d3..5b92e205eb6ef43268b1565f087d7526f2bebdef 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -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"));
 #ifdef __WXMSW__
     menuFile->Append(Sound_SelectResource, _T("Select WAV &resource...\tCtrl-R"), _T("Select a new resource to play"));
     menuFile->Append(Sound_SelectFile, _T("Select WAV &file...\tCtrl-O"), _T("Select a new wav file to play"));
 #ifdef __WXMSW__
     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"));
 
     wxMenu *playMenu = new wxMenu;
     menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
 
     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 )
     {
         // this is the dump of cuckoo.wav
     if ( m_useMemory )
     {
         // 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() )
     {
         return snd.Create(m_soundRes, true);
     if ( !m_soundRes.empty() )
     {
         return snd.Create(m_soundRes, true);