From: Robin Dunn Date: Thu, 11 Mar 2004 19:31:33 +0000 (+0000) Subject: Changed the sound sample to allow the user to choose a wav file to X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/aa92c3988019ad6fdf5000d1754c317373553412 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 index 0000000000..e5443fffab 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 index 0000000000..fdc22cc9b6 Binary files /dev/null and b/samples/sound/911ch.wav differ diff --git a/samples/sound/Makefile.in b/samples/sound/Makefile.in index 26aeb41314..5f35ab1aa5 100644 --- 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 . - @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; \ diff --git a/samples/sound/chord.wav b/samples/sound/chord.wav new file mode 100644 index 0000000000..0193a11623 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 index 0000000000..d535732669 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 index 0000000000..91a65a3f56 Binary files /dev/null and b/samples/sound/ding.wav differ diff --git a/samples/sound/makefile.bcc b/samples/sound/makefile.bcc index 7d6fbd7da0..c4e6095240 100644 --- 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) - 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 $** diff --git a/samples/sound/makefile.gcc b/samples/sound/makefile.gcc index c1a173e3d1..7d07a7168b 100644 --- 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) - 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 diff --git a/samples/sound/makefile.vc b/samples/sound/makefile.vc index ac456f01b4..c52968ecc4 100644 --- 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) - 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 $** diff --git a/samples/sound/makefile.wat b/samples/sound/makefile.wat index 6bbc55f2df..dfde91dcc8 100644 --- 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) - 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 $< diff --git a/samples/sound/notify.wav b/samples/sound/notify.wav new file mode 100644 index 0000000000..726bc0d19f Binary files /dev/null and b/samples/sound/notify.wav differ diff --git a/samples/sound/sound.bkl b/samples/sound/sound.bkl index 5dc4eb69d6..4e3245ad42 100644 --- a/samples/sound/sound.bkl +++ b/samples/sound/sound.bkl @@ -13,7 +13,10 @@ - doggrowl.wav + + 9000g.wav 911ch.wav chord.wav cuckoo.wav + ding.wav doggrowl.wav notify.wav + diff --git a/samples/sound/sound.cpp b/samples/sound/sound.cpp index 32dd7b6406..f1d3fa96d5 100644 --- 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/textctrl.h" + #include "wx/filedlg.h" #endif #include "wx/sound.h" @@ -62,12 +64,18 @@ public: 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 NotifyUsingFile(const wxString& name); + + 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() @@ -86,7 +94,8 @@ enum 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) + EVT_MENU(Sound_SelectFile, MyFrame::OnSelectFile) 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; + m_soundFile = WAV_FILE; // 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")); + 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")); @@ -167,11 +179,39 @@ MyFrame::MyFrame(const wxString& title) // ... 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 + +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 @@ -182,7 +222,7 @@ void MyFrame::OnPlaySync(wxCommandEvent& WXUNUSED(event)) { 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); } @@ -191,7 +231,7 @@ void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event)) { 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); } @@ -199,7 +239,7 @@ void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event)) { wxBusyCursor busy; - wxSound snd(WAV_FILE); + wxSound snd(m_soundFile); if (snd.IsOk()) snd.Play(wxSOUND_ASYNC); } @@ -208,7 +248,7 @@ void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event)) { 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); }