Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed wxWave to wxSound

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25470 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-02-02 13:03:23 +00:00
parent 3aefa658c8
commit d93966b92a
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/joytest/Makefile.in
View File

@@ -28,6 +28,7 @@ TOOLKIT_VERSION = @TOOLKIT_VERSION@
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
EXTRALIBS = @EXTRALIBS@ EXTRALIBS = @EXTRALIBS@
EXTRALIBS_GUI = @EXTRALIBS_GUI@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
EXTRALIBS_SDL = @EXTRALIBS_SDL@
HOST_SUFFIX = @HOST_SUFFIX@ HOST_SUFFIX = @HOST_SUFFIX@
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@ SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -48,6 +49,7 @@ JOYTEST_OBJECTS = \
@COND_DEPS_TRACKING_0@CXXC = $(CXX) @COND_DEPS_TRACKING_0@CXXC = $(CXX)
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX) @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
@COND_USE_GUI_0@PORTNAME = base @COND_USE_GUI_0@PORTNAME = base
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION) @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -125,7 +127,7 @@ distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc) joytest$(EXEEXT): $(JOYTEST_OBJECTS) $(__joytest___win32rc)
$(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) $(CXX) -o $@ $(JOYTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ADV_p) $(PLUGIN_ADV_EXTRALIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(__joytest___mac_rezcmd) $(__joytest___mac_rezcmd)
$(__joytest___mac_setfilecmd) $(__joytest___mac_setfilecmd)
$(__joytest___os2_emxbindcmd) $(__joytest___os2_emxbindcmd)

10
samples/joytest/joytest.cpp
View File

@@ -28,7 +28,7 @@
# error You must set wxUSE_STATUSBAR to 1 in setup.h # error You must set wxUSE_STATUSBAR to 1 in setup.h
#endif #endif
#include "wx/wave.h" #include "wx/sound.h"
#include "wx/joystick.h" #include "wx/joystick.h"
#include "joytest.h" #include "joytest.h"
@@ -53,9 +53,9 @@ bool MyApp::OnInit()
return FALSE; return FALSE;
} }
#if wxUSE_WAVE #if wxUSE_SOUND
m_fire.Create(_T("gun.wav")); m_fire.Create(_T("gun.wav"));
#endif // wxUSE_WAVE #endif // wxUSE_SOUND
m_maxX = stick.GetXMax(); m_maxX = stick.GetXMax();
m_maxY = stick.GetYMax(); m_maxY = stick.GetYMax();
@@ -143,12 +143,12 @@ void MyCanvas::OnJoystickEvent(wxJoystickEvent& event)
frame->SetStatusText(buf); frame->SetStatusText(buf);
#if wxUSE_WAVE #if wxUSE_SOUND
if (event.ButtonDown() && wxGetApp().m_fire.IsOk()) if (event.ButtonDown() && wxGetApp().m_fire.IsOk())
{ {
wxGetApp().m_fire.Play(); wxGetApp().m_fire.Play();
} }
#endif // wxUSE_WAVE #endif // wxUSE_SOUND
} }
BEGIN_EVENT_TABLE(MyFrame, wxFrame) BEGIN_EVENT_TABLE(MyFrame, wxFrame)

6
samples/joytest/joytest.h
View File

@@ -19,9 +19,9 @@ public:
int m_maxX; int m_maxX;
int m_maxY; int m_maxY;
#if wxUSE_WAVE #if wxUSE_SOUND
wxWave m_fire; wxSound m_fire;
#endif // wxUSE_WAVE #endif // wxUSE_SOUND
}; };
DECLARE_APP(MyApp) DECLARE_APP(MyApp)

20
samples/sound/sound.cpp
View File

@@ -24,7 +24,7 @@
#include "wx/msgdlg.h" #include "wx/msgdlg.h"
#endif #endif
#include "wx/wave.h" #include "wx/sound.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// resources // resources
@@ -65,7 +65,7 @@ public:
void OnAbout(wxCommandEvent& event); void OnAbout(wxCommandEvent& event);
private: private:
wxWave *m_sound; wxSound *m_sound;
// any class wishing to process wxWindows events must use this macro // any class wishing to process wxWindows events must use this macro
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
@@ -180,35 +180,35 @@ void MyFrame::OnPlaySync(wxCommandEvent& WXUNUSED(event))
{ {
wxBusyCursor busy; wxBusyCursor busy;
if (!m_sound) if (!m_sound)
m_sound = new wxWave(WAV_FILE); m_sound = new wxSound(WAV_FILE);
if (m_sound->IsOk()) if (m_sound->IsOk())
m_sound->Play(false/*async*/); m_sound->Play(wxSOUND_SYNC);
} }
void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPlayAsync(wxCommandEvent& WXUNUSED(event))
{ {
wxBusyCursor busy; wxBusyCursor busy;
if (!m_sound) if (!m_sound)
m_sound = new wxWave(WAV_FILE); m_sound = new wxSound(WAV_FILE);
if (m_sound->IsOk()) if (m_sound->IsOk())
m_sound->Play(true/*async*/); m_sound->Play(wxSOUND_ASYNC);
} }
void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPlayAsyncOnStack(wxCommandEvent& WXUNUSED(event))
{ {
wxBusyCursor busy; wxBusyCursor busy;
wxWave snd(WAV_FILE); wxSound snd(WAV_FILE);
if (snd.IsOk()) if (snd.IsOk())
snd.Play(true/*async*/); snd.Play(wxSOUND_ASYNC);
} }
void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnPlayLoop(wxCommandEvent& WXUNUSED(event))
{ {
wxBusyCursor busy; wxBusyCursor busy;
if (!m_sound) if (!m_sound)
m_sound = new wxWave(WAV_FILE); m_sound = new wxSound(WAV_FILE);
if (m_sound->IsOk()) if (m_sound->IsOk())
m_sound->Play(true/*async*/, true/*loop*/); m_sound->Play(wxSOUND_ASYNC | wxSOUND_LOOP);
} }
void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))

8
utils/configtool/configs/wxwin250.wxs
View File

@@ -3803,8 +3803,8 @@ A class for setting miscellaneous options that do not fit in with the wxWindows
<setting type="bool-check"> <setting type="bool-check">
<active>1</active> <active>1</active>
<enabled>1</enabled> <enabled>1</enabled>
<name>wxUSE_WAVE</name> <name>wxUSE_SOUND</name>
<description>&lt;B&gt;wxWave&lt;/B&gt;&lt;P&gt; <description>&lt;B&gt;wxSound&lt;/B&gt;&lt;P&gt;
Simple .wav class for short sounds.</description> Simple .wav class for short sounds.</description>
<default-state>1</default-state> <default-state>1</default-state>
@@ -3815,8 +3815,8 @@ Simple .wav class for short sounds.</description>
<indeterminate-if></indeterminate-if> <indeterminate-if></indeterminate-if>
<exclusivity></exclusivity> <exclusivity></exclusivity>
<context></context> <context></context>
<configure-command>--enable-wave</configure-command> <configure-command>--enable-sound</configure-command>
<help-topic>wxWave</help-topic> <help-topic>wxSound</help-topic>
<notes></notes> <notes></notes>
</setting> </setting>
<setting type="bool-check"> <setting type="bool-check">