AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Robin Dunn 2004-03-11 19:31:33 +00:00
parent 544c4a3bde
commit aa92c39880
13 changed files with 56 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
samples/sound/9000g.wav Normal file
View File

Binary file not shown.

BIN
samples/sound/911ch.wav Normal file
View File

Binary file not shown.

2
samples/sound/Makefile.in
View File

@ -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; \

BIN
samples/sound/chord.wav Normal file
View File

Binary file not shown.

BIN
samples/sound/cuckoo.wav Normal file
View File

Binary file not shown.

BIN
samples/sound/ding.wav Normal file
View File

Binary file not shown.

2
samples/sound/makefile.bcc
View File

@ -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 $**

2
samples/sound/makefile.gcc
View File

@ -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

2
samples/sound/makefile.vc
View File

@ -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 $**

2
samples/sound/makefile.wat
View File

@ -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 $<

BIN
samples/sound/notify.wav Normal file
View File

Binary file not shown.

5
samples/sound/sound.bkl
View File

@ -13,7 +13,10 @@
</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>

50
samples/sound/sound.cpp
View File

@ -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"
@ -63,11 +65,17 @@ public:
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;
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);
}