Changed the sound sample to allow the user to choose a wav file to

work with, and also added some additional test wav files of various
sampling rates, sample sizes and channels.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/sound/9000g.wav b/samples/sound/9000g.wav
new file mode 100644 (file)
index 0000000..e5443ff
Binary files /dev/null and b/samples/sound/9000g.wav differ

diff --git a/samples/sound/911ch.wav b/samples/sound/911ch.wav
new file mode 100644 (file)
index 0000000..fdc22cc
Binary files /dev/null and b/samples/sound/911ch.wav differ

diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in
index 26aeb4131425f0414cca614d0a567cd3ac9669df..5f35ab1aa5cc3e5acffce77e3733acb0f5f7ff03 100644 (file)
--- a/samples/sound/Makefile.in
+++ b/samples/sound/Makefile.in
@@ -158,7 +158,7 @@ sound.app/Contents/PkgInfo: sound$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $
 
 data: 
        @mkdir -p .
 
 data: 
        @mkdir -p .

-       @for f in doggrowl.wav; do \
+       @for f in 9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav; do \

        if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
        cp -pRf $(srcdir)/$$f . ; \
        fi; \
        if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
        cp -pRf $(srcdir)/$$f . ; \
        fi; \

diff --git a/samples/sound/chord.wav b/samples/sound/chord.wav
new file mode 100644 (file)
index 0000000..0193a11
Binary files /dev/null and b/samples/sound/chord.wav differ

diff --git a/samples/sound/cuckoo.wav b/samples/sound/cuckoo.wav
new file mode 100644 (file)
index 0000000..d535732
Binary files /dev/null and b/samples/sound/cuckoo.wav differ

diff --git a/samples/sound/ding.wav b/samples/sound/ding.wav
new file mode 100644 (file)
index 0000000..91a65a3
Binary files /dev/null and b/samples/sound/ding.wav differ

diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc
index 7d6fbd7da0fcfbf65e8ca58566735ba226f131b4..c4e6095240b5d42a7e14a47ff14c823484e926ce 100644 (file)
--- a/samples/sound/makefile.bcc
+++ b/samples/sound/makefile.bcc
@@ -175,7 +175,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS)  $(OBJS)\sound_sample.res
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (doggrowl.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**
 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
        brcc32 -32 -r -fo$@ -i$(BCCDIR)\include  -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples $**

diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc
index c1a173e3d16158962b2eda95587a073be2388066..7d07a7168b5892045b6bfb0056db09b1d360e85f 100644 (file)
--- a/samples/sound/makefile.gcc
+++ b/samples/sound/makefile.gcc
@@ -172,7 +172,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample_rc.o
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %%f in (doggrowl.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+       for %%f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)

 
 $(OBJS)\sound_sample_rc.o: ./../../samples/sample.rc
        windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 
 $(OBJS)\sound_sample_rc.o: ./../../samples/sample.rc
        windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples

diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc
index ac456f01b49a9800cafa2e994f7daa7e7ea59ef4..c52968ecc43e05b20488046cfb9d86628a4407ff 100644 (file)
--- a/samples/sound/makefile.vc
+++ b/samples/sound/makefile.vc
@@ -259,7 +259,7 @@ $(OBJS)\sound.exe: $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (doggrowl.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**
 
 $(OBJS)\sound_sample.res: .\..\..\samples\sample.rc
        rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_2_p_1) $(__NO_VC_CRTDBG_p_1) /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i .\..\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples $**

diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat
index 6bbc55f2dfd2ba9a00567e25a67e5bbebb483b4e..dfde91dcc806ec1100247fb7a339f68f8b285ae4 100644 (file)
--- a/samples/sound/makefile.wat
+++ b/samples/sound/makefile.wat
@@ -212,7 +212,7 @@ $(OBJS)\sound.exe :  $(SOUND_OBJECTS) $(OBJS)\sound_sample.res
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)
 
 data : .SYMBOLIC 
        if not exist $(OBJS) mkdir $(OBJS)

-       for %f in (doggrowl.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+       for %f in (9000g.wav 911ch.wav chord.wav cuckoo.wav ding.wav doggrowl.wav notify.wav) do if not exist $(OBJS)\%f copy .\%f $(OBJS)

 
 $(OBJS)\sound_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
 
 $(OBJS)\sound_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<

diff --git a/samples/sound/notify.wav b/samples/sound/notify.wav
new file mode 100644 (file)
index 0000000..726bc0d
Binary files /dev/null and b/samples/sound/notify.wav differ

diff --git a/samples/sound/sound.bkl b/samples/sound/sound.bkl
index 5dc4eb69d66555434d0aa9c4a54a63781f5ab430..4e3245ad4299ed0bdab04fcacaedb43fd05a3eb8 100644 (file)
--- a/samples/sound/sound.bkl
+++ b/samples/sound/sound.bkl
@@ -13,7 +13,10 @@
     </exe>
     
     <wx-data id="data">
     </exe>
     
     <wx-data id="data">

-        <files>doggrowl.wav</files>
+        <files>
+           9000g.wav  911ch.wav  chord.wav  cuckoo.wav  
+           ding.wav  doggrowl.wav  notify.wav
+       </files>

     </wx-data>
 
 </makefile>
     </wx-data>
 
 </makefile>

diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp
index 32dd7b640606731bcb2b2c19b440219ab4753571..f1d3fa96d55584e8ab62e9260c38531aca9111b3 100644 (file)
--- a/samples/sound/sound.cpp
+++ b/samples/sound/sound.cpp
@@ -23,6 +23,8 @@
     #include "wx/menu.h"
     #include "wx/msgdlg.h"
     #include "wx/icon.h"
     #include "wx/menu.h"
     #include "wx/msgdlg.h"
     #include "wx/icon.h"

+    #include "wx/textctrl.h"
+    #include "wx/filedlg.h"

 #endif
 
 #include "wx/sound.h"
 #endif
 
 #include "wx/sound.h"


@@ -62,12 +64,18 @@ public:
     void OnPlayAsync(wxCommandEvent& event);
     void OnPlayAsyncOnStack(wxCommandEvent& event);
     void OnPlayLoop(wxCommandEvent& event);
     void OnPlayAsync(wxCommandEvent& event);
     void OnPlayAsyncOnStack(wxCommandEvent& event);
     void OnPlayLoop(wxCommandEvent& event);

-    
+
+    void OnSelectFile(wxCommandEvent& event);

     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
 

+    void NotifyUsingFile(const wxString& name);
+    
+

 private:
 private:

-    wxSound *m_sound;
+    wxSound*    m_sound;
+    wxString    m_soundFile;
+    wxTextCtrl* m_tc;

     
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()
     
     // any class wishing to process wxWindows events must use this macro
     DECLARE_EVENT_TABLE()


@@ -86,7 +94,8 @@ enum
     Sound_PlaySync = wxID_HIGHEST + 1,
     Sound_PlayAsync,
     Sound_PlayAsyncOnStack,
     Sound_PlaySync = wxID_HIGHEST + 1,
     Sound_PlayAsync,
     Sound_PlayAsyncOnStack,

-    Sound_PlayLoop
+    Sound_PlayLoop,
+    Sound_SelectFile

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -97,6 +106,7 @@ enum
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)
 // handlers) which process them. It can be also done at run-time, but for the
 // simple menu events like this the static method is much simpler.
 BEGIN_EVENT_TABLE(MyFrame, wxFrame)

+    EVT_MENU(Sound_SelectFile,       MyFrame::OnSelectFile)

     EVT_MENU(Sound_Quit,             MyFrame::OnQuit)
     EVT_MENU(Sound_About,            MyFrame::OnAbout)
     EVT_MENU(Sound_PlaySync,         MyFrame::OnPlaySync)
     EVT_MENU(Sound_Quit,             MyFrame::OnQuit)
     EVT_MENU(Sound_About,            MyFrame::OnAbout)
     EVT_MENU(Sound_PlaySync,         MyFrame::OnPlaySync)


@@ -145,6 +155,7 @@ MyFrame::MyFrame(const wxString& title)
        : wxFrame(NULL, wxID_ANY, title)
 {
     m_sound = NULL;
        : wxFrame(NULL, wxID_ANY, title)
 {
     m_sound = NULL;

+    m_soundFile = WAV_FILE;

 
     // set the frame icon
     SetIcon(wxICON(sample));
 
     // set the frame icon
     SetIcon(wxICON(sample));


@@ -153,6 +164,7 @@ MyFrame::MyFrame(const wxString& title)
     wxMenu *helpMenu = new wxMenu;
     wxMenu *playMenu = new wxMenu;
     helpMenu->Append(Sound_About, _T("&About...\tF1"), _T("Show about dialog"));
     wxMenu *helpMenu = new wxMenu;
     wxMenu *playMenu = new wxMenu;
     helpMenu->Append(Sound_About, _T("&About...\tF1"), _T("Show about dialog"));

+    menuFile->Append(Sound_SelectFile, _T("&Select WAV file"), _T("Select a new wav file to play"));

     menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
     playMenu->Append(Sound_PlaySync, _T("Play sound &synchronously"));
     playMenu->Append(Sound_PlayAsync, _T("Play sound &asynchronously"));
     menuFile->Append(Sound_Quit, _T("E&xit\tAlt-X"), _T("Quit this program"));
     playMenu->Append(Sound_PlaySync, _T("Play sound &synchronously"));
     playMenu->Append(Sound_PlayAsync, _T("Play sound &asynchronously"));


@@ -167,11 +179,39 @@ MyFrame::MyFrame(const wxString& title)
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);
 
     // ... and attach this menu bar to the frame
     SetMenuBar(menuBar);

+
+    m_tc = new wxTextCtrl(this, -1, "", wxDefaultPosition, wxDefaultSize,
+                          wxTE_MULTILINE|wxTE_READONLY);
+    NotifyUsingFile(m_soundFile);
+}
+
+
+
+void MyFrame::NotifyUsingFile(const wxString& name)
+{
+    wxString msg;
+    msg << _T("Using sound file: ") << name << _T("\n");
+    m_tc->AppendText(msg);

 }
 
 
 // event handlers
 
 }
 
 
 // event handlers
 

+
+void MyFrame::OnSelectFile(wxCommandEvent& WXUNUSED(event))
+{
+    wxFileDialog dlg(this, _T("Choose a sound file"),
+                     wxEmptyString, wxEmptyString,
+                     _T("WAV files (*.wav)|*.wav"), wxOPEN|wxCHANGE_DIR);
+    if ( dlg.ShowModal() == wxID_OK )
+    {
+        m_soundFile = dlg.GetPath();
+        delete m_sound;
+        m_sound = NULL;
+        NotifyUsingFile(m_soundFile);
+    }
+}
+

 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     // true is to force the frame to close
 void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
     // true is to force the frame to close


@@ -182,7 +222,7 @@ void MyFrame::OnPlaySync(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
     if (!m_sound)
 {
     wxBusyCursor busy;
     if (!m_sound)

-        m_sound = new wxSound(WAV_FILE);
+        m_sound = new wxSound(m_soundFile);

     if (m_sound->IsOk())
         m_sound->Play(wxSOUND_SYNC);
 }
     if (m_sound->IsOk())
         m_sound->Play(wxSOUND_SYNC);
 }


@@ -191,7 +231,7 @@ void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
     if (!m_sound)
 {
     wxBusyCursor busy;
     if (!m_sound)

-        m_sound = new wxSound(WAV_FILE);
+        m_sound = new wxSound(m_soundFile);

     if (m_sound->IsOk())
         m_sound->Play(wxSOUND_ASYNC);
 }
     if (m_sound->IsOk())
         m_sound->Play(wxSOUND_ASYNC);
 }


@@ -199,7 +239,7 @@ void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event))
 void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
 void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;

-    wxSound snd(WAV_FILE);
+    wxSound snd(m_soundFile);

     if (snd.IsOk())
         snd.Play(wxSOUND_ASYNC);
 }
     if (snd.IsOk())
         snd.Play(wxSOUND_ASYNC);
 }


@@ -208,7 +248,7 @@ void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event))
 {
     wxBusyCursor busy;
     if (!m_sound)
 {
     wxBusyCursor busy;
     if (!m_sound)

-        m_sound = new wxSound(WAV_FILE);
+        m_sound = new wxSound(m_soundFile);

     if (m_sound->IsOk())
         m_sound->Play(wxSOUND_ASYNC | wxSOUND_LOOP);
 }
     if (m_sound->IsOk())
         m_sound->Play(wxSOUND_ASYNC | wxSOUND_LOOP);
 }