mirror of
https://github.com/wxWidgets/wxWidgets.git
synced 2026-09-20 12:59:31 +08:00
adapting to new sound file organization for osx
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
+48
@@ -11921,6 +11921,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_carbon_drawer.o \
|
||||
monodll_dataview_osx.o \
|
||||
monodll_carbon_dataview.o \
|
||||
monodll_sound_osx.o \
|
||||
monodll_carbon_sound.o \
|
||||
monodll_carbon_taskbar.o \
|
||||
monodll_hidjoystick.o
|
||||
@@ -11928,7 +11929,9 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \
|
||||
monodll_taskbarcmn.o \
|
||||
monodll_animateg.o \
|
||||
monodll_sound_osx.o \
|
||||
monodll_carbon_sound.o \
|
||||
monodll_core_sound.o \
|
||||
monodll_cocoa_aboutdlg.o \
|
||||
monodll_dataview_osx.o \
|
||||
monodll_cocoa_dataview.o \
|
||||
@@ -12097,6 +12100,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
|
||||
monolib_carbon_drawer.o \
|
||||
monolib_dataview_osx.o \
|
||||
monolib_carbon_dataview.o \
|
||||
monolib_sound_osx.o \
|
||||
monolib_carbon_sound.o \
|
||||
monolib_carbon_taskbar.o \
|
||||
monolib_hidjoystick.o
|
||||
@@ -12104,7 +12108,9 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
|
||||
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
|
||||
monolib_taskbarcmn.o \
|
||||
monolib_animateg.o \
|
||||
monolib_sound_osx.o \
|
||||
monolib_carbon_sound.o \
|
||||
monolib_core_sound.o \
|
||||
monolib_cocoa_aboutdlg.o \
|
||||
monolib_dataview_osx.o \
|
||||
monolib_cocoa_dataview.o \
|
||||
@@ -12367,6 +12373,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
|
||||
advdll_drawer.o \
|
||||
advdll_dataview_osx.o \
|
||||
advdll_carbon_dataview.o \
|
||||
advdll_sound_osx.o \
|
||||
advdll_carbon_sound.o \
|
||||
advdll_carbon_taskbar.o \
|
||||
advdll_hidjoystick.o
|
||||
@@ -12374,7 +12381,9 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
|
||||
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
|
||||
advdll_taskbarcmn.o \
|
||||
advdll_animateg.o \
|
||||
advdll_sound_osx.o \
|
||||
advdll_carbon_sound.o \
|
||||
advdll_core_sound.o \
|
||||
advdll_cocoa_aboutdlg.o \
|
||||
advdll_dataview_osx.o \
|
||||
advdll_cocoa_dataview.o \
|
||||
@@ -12449,6 +12458,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
|
||||
advlib_drawer.o \
|
||||
advlib_dataview_osx.o \
|
||||
advlib_carbon_dataview.o \
|
||||
advlib_sound_osx.o \
|
||||
advlib_carbon_sound.o \
|
||||
advlib_carbon_taskbar.o \
|
||||
advlib_hidjoystick.o
|
||||
@@ -12456,7 +12466,9 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
|
||||
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
|
||||
advlib_taskbarcmn.o \
|
||||
advlib_animateg.o \
|
||||
advlib_sound_osx.o \
|
||||
advlib_carbon_sound.o \
|
||||
advlib_core_sound.o \
|
||||
advlib_cocoa_aboutdlg.o \
|
||||
advlib_dataview_osx.o \
|
||||
advlib_cocoa_dataview.o \
|
||||
@@ -18619,6 +18631,12 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monodll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
|
||||
|
||||
@@ -18637,6 +18655,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@monodll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monodll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONODLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@@ -23347,6 +23368,12 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@monolib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
|
||||
|
||||
@@ -23365,6 +23392,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@monolib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@monolib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(MONOLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA_USE_GUI_1@ $(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@@ -31819,6 +31849,12 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@advdll_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON@advdll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advdll_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON@advdll_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
|
||||
|
||||
@@ -31837,6 +31873,9 @@ advdll_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA@advdll_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advdll_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advdll_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVDLL_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
@@ -32134,6 +32173,12 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@advlib_carbon_dataview.o: $(srcdir)/src/osx/carbon/dataview.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/dataview.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON@advlib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advlib_sound_osx.o: $(srcdir)/src/osx/sound_osx.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/sound_osx.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_CARBON@advlib_carbon_sound.o: $(srcdir)/src/osx/carbon/sound.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_CARBON@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/carbon/sound.cpp
|
||||
|
||||
@@ -32152,6 +32197,9 @@ advlib_wizard.o: $(srcdir)/src/generic/wizard.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA@advlib_hidjoystick.o: $(srcdir)/src/osx/core/hidjoystick.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/hidjoystick.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advlib_core_sound.o: $(srcdir)/src/osx/core/sound.cpp $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_CXXFLAGS) $(srcdir)/src/osx/core/sound.cpp
|
||||
|
||||
@COND_TOOLKIT_OSX_COCOA@advlib_cocoa_aboutdlg.o: $(srcdir)/src/osx/cocoa/aboutdlg.mm $(ADVLIB_ODEP)
|
||||
@COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm
|
||||
|
||||
|
||||
+48
-23
@@ -17,37 +17,62 @@
|
||||
|
||||
#include "wx/object.h"
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSoundTimer;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSoundData
|
||||
{
|
||||
public :
|
||||
wxSoundData();
|
||||
virtual ~wxSoundData();
|
||||
|
||||
virtual bool Play(unsigned int flags) = 0;
|
||||
// stops the sound and deletes the optional timer
|
||||
virtual void Stop();
|
||||
// can be called by a timer for repeated tasks during playback
|
||||
virtual void SoundTask();
|
||||
|
||||
// does the true work of stopping and cleaning up
|
||||
virtual void DoStop() = 0;
|
||||
protected :
|
||||
void CreateAndStartTimer();
|
||||
|
||||
unsigned int m_flags;
|
||||
wxSoundTimer* m_pTimer;
|
||||
} ;
|
||||
|
||||
class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
|
||||
{
|
||||
public:
|
||||
wxSound();
|
||||
wxSound(const wxString& fileName, bool isResource = FALSE);
|
||||
wxSound(int size, const wxByte* data);
|
||||
virtual ~wxSound();
|
||||
wxSound();
|
||||
wxSound(const wxString& fileName, bool isResource = FALSE);
|
||||
wxSound(int size, const wxByte* data);
|
||||
virtual ~wxSound();
|
||||
|
||||
public:
|
||||
bool Create(const wxString& fileName, bool isResource = FALSE);
|
||||
bool IsOk() const { return !m_sndname.IsEmpty(); }
|
||||
static void Stop();
|
||||
static bool IsPlaying();
|
||||
// Create from resource or file
|
||||
bool Create(const wxString& fileName, bool isResource = FALSE);
|
||||
// Create from data
|
||||
bool Create(int size, const wxByte* data);
|
||||
|
||||
void* GetHandle();
|
||||
bool IsOk() const { return m_data != NULL; }
|
||||
|
||||
// Stop playing any sound
|
||||
static void Stop();
|
||||
|
||||
// Returns true if a sound is being played
|
||||
static bool IsPlaying();
|
||||
|
||||
// Notification when a sound has stopped
|
||||
static void SoundStopped(const wxSoundData* data);
|
||||
|
||||
protected:
|
||||
bool DoPlay(unsigned flags) const;
|
||||
bool DoPlay(unsigned flags) const;
|
||||
void Init();
|
||||
|
||||
private:
|
||||
wxString m_sndname; //file path
|
||||
char* m_hSnd; //pointer to resource or memory location
|
||||
int m_waveLength; //size of file in memory mode
|
||||
void* m_pTimer; //timer
|
||||
|
||||
enum wxSoundType
|
||||
{
|
||||
wxSound_MEMORY,
|
||||
wxSound_FILE,
|
||||
wxSound_RESOURCE,
|
||||
wxSound_NONE
|
||||
} m_type; //mode
|
||||
// data of this object
|
||||
class wxSoundData *m_data;
|
||||
|
||||
wxDECLARE_NO_COPY_CLASS(wxSound);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
+261
-372
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user