update from Jonas for 2.5.1 (patch 901921)

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

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 77f57b9685fafa36eeff0b29c1f78d32dad19662..32dd7b640606731bcb2b2c19b440219ab4753571 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -22,9 +22,11 @@
     #include "wx/frame.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"
+    #include "wx/icon.h"
 #endif
 
-#include "wx/wave.h"
+#include "wx/sound.h"
+#include "wx/numdlg.h"
 
 // ----------------------------------------------------------------------------
 // resources
@@ -65,7 +67,7 @@ public:
     void OnAbout(wxCommandEvent& event);
 
 private:
-    wxWave *m_sound;
+    wxSound *m_sound;
     
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
@@ -180,35 +182,35 @@ void MyFrame::OnPlaySync(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
     if (!m_sound)
-        m_sound = new wxWave(WAV_FILE);
+        m_sound = new wxSound(WAV_FILE);
     if (m_sound->IsOk())
-        m_sound->Play(false/*async*/);
+        m_sound->Play(wxSOUND_SYNC);
 }
 
 void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
     if (!m_sound)
-        m_sound = new wxWave(WAV_FILE);
+        m_sound = new wxSound(WAV_FILE);
     if (m_sound->IsOk())
-        m_sound->Play(true/*async*/);
+        m_sound->Play(wxSOUND_ASYNC);
 }
 
 void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
-    wxWave snd(WAV_FILE);
+    wxSound snd(WAV_FILE);
     if (snd.IsOk())
-        snd.Play(true/*async*/);
+        snd.Play(wxSOUND_ASYNC);
 }
 
 void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
     if (!m_sound)
-        m_sound = new wxWave(WAV_FILE);
+        m_sound = new wxSound(WAV_FILE);
     if (m_sound->IsOk())
-        m_sound->Play(true/*async*/, true/*loop*/);
+        m_sound->Play(wxSOUND_ASYNC | wxSOUND_LOOP);
 }
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))