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

adapting to new sound file organization for osx

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61916 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2009-09-13 18:28:45 +00:00
parent 3ba703f9be
commit deb0a11e99
3 changed files with 357 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Makefile.in
View File

@@ -11921,6 +11921,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_carbon_drawer.o \ monodll_carbon_drawer.o \
monodll_dataview_osx.o \ monodll_dataview_osx.o \
monodll_carbon_dataview.o \ monodll_carbon_dataview.o \
monodll_sound_osx.o \
monodll_carbon_sound.o \ monodll_carbon_sound.o \
monodll_carbon_taskbar.o \ monodll_carbon_taskbar.o \
monodll_hidjoystick.o monodll_hidjoystick.o
@@ -11928,7 +11929,9 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS = \
COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS = \
monodll_taskbarcmn.o \ monodll_taskbarcmn.o \
monodll_animateg.o \ monodll_animateg.o \
monodll_sound_osx.o \
monodll_carbon_sound.o \ monodll_carbon_sound.o \
monodll_core_sound.o \
monodll_cocoa_aboutdlg.o \ monodll_cocoa_aboutdlg.o \
monodll_dataview_osx.o \ monodll_dataview_osx.o \
monodll_cocoa_dataview.o \ monodll_cocoa_dataview.o \
@@ -12097,6 +12100,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_carbon_drawer.o \ monolib_carbon_drawer.o \
monolib_dataview_osx.o \ monolib_dataview_osx.o \
monolib_carbon_dataview.o \ monolib_carbon_dataview.o \
monolib_sound_osx.o \
monolib_carbon_sound.o \ monolib_carbon_sound.o \
monolib_carbon_taskbar.o \ monolib_carbon_taskbar.o \
monolib_hidjoystick.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 = \ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_0 = \
monolib_taskbarcmn.o \ monolib_taskbarcmn.o \
monolib_animateg.o \ monolib_animateg.o \
monolib_sound_osx.o \
monolib_carbon_sound.o \ monolib_carbon_sound.o \
monolib_core_sound.o \
monolib_cocoa_aboutdlg.o \ monolib_cocoa_aboutdlg.o \
monolib_dataview_osx.o \ monolib_dataview_osx.o \
monolib_cocoa_dataview.o \ monolib_cocoa_dataview.o \
@@ -12367,6 +12373,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_drawer.o \ advdll_drawer.o \
advdll_dataview_osx.o \ advdll_dataview_osx.o \
advdll_carbon_dataview.o \ advdll_carbon_dataview.o \
advdll_sound_osx.o \
advdll_carbon_sound.o \ advdll_carbon_sound.o \
advdll_carbon_taskbar.o \ advdll_carbon_taskbar.o \
advdll_hidjoystick.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 = \ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_8 = \
advdll_taskbarcmn.o \ advdll_taskbarcmn.o \
advdll_animateg.o \ advdll_animateg.o \
advdll_sound_osx.o \
advdll_carbon_sound.o \ advdll_carbon_sound.o \
advdll_core_sound.o \
advdll_cocoa_aboutdlg.o \ advdll_cocoa_aboutdlg.o \
advdll_dataview_osx.o \ advdll_dataview_osx.o \
advdll_cocoa_dataview.o \ advdll_cocoa_dataview.o \
@@ -12449,6 +12458,7 @@ COND_TOOLKIT_OSX_CARBON___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_drawer.o \ advlib_drawer.o \
advlib_dataview_osx.o \ advlib_dataview_osx.o \
advlib_carbon_dataview.o \ advlib_carbon_dataview.o \
advlib_sound_osx.o \
advlib_carbon_sound.o \ advlib_carbon_sound.o \
advlib_carbon_taskbar.o \ advlib_carbon_taskbar.o \
advlib_hidjoystick.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 = \ COND_TOOLKIT_OSX_COCOA___ADVANCED_PLATFORM_SRC_OBJECTS_9 = \
advlib_taskbarcmn.o \ advlib_taskbarcmn.o \
advlib_animateg.o \ advlib_animateg.o \
advlib_sound_osx.o \
advlib_carbon_sound.o \ advlib_carbon_sound.o \
advlib_core_sound.o \
advlib_cocoa_aboutdlg.o \ advlib_cocoa_aboutdlg.o \
advlib_dataview_osx.o \ advlib_dataview_osx.o \
advlib_cocoa_dataview.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@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@ $(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@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 @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@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_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@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 @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@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@ $(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@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 @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@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_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@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 @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@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@ $(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@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 @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@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_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@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 @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@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@ $(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@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 @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@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_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@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 @COND_TOOLKIT_OSX_COCOA@ $(CXXC) -c -o $@ $(ADVLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/aboutdlg.mm

69
include/wx/osx/sound.h
View File

@@ -17,37 +17,62 @@
#include "wx/object.h" #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 class WXDLLIMPEXP_ADV wxSound : public wxSoundBase
{ {
public: public:
wxSound(); wxSound();
wxSound(const wxString& fileName, bool isResource = FALSE); wxSound(const wxString& fileName, bool isResource = FALSE);
wxSound(int size, const wxByte* data); wxSound(int size, const wxByte* data);
virtual ~wxSound(); virtual ~wxSound();
public: // Create from resource or file
bool Create(const wxString& fileName, bool isResource = FALSE); bool Create(const wxString& fileName, bool isResource = FALSE);
bool IsOk() const { return !m_sndname.IsEmpty(); } // Create from data
static void Stop(); bool Create(int size, const wxByte* data);
static bool IsPlaying();
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);
void* GetHandle();
protected: protected:
bool DoPlay(unsigned flags) const; bool DoPlay(unsigned flags) const;
void Init();
private: private:
wxString m_sndname; //file path // data of this object
char* m_hSnd; //pointer to resource or memory location class wxSoundData *m_data;
int m_waveLength; //size of file in memory mode
void* m_pTimer; //timer
enum wxSoundType wxDECLARE_NO_COPY_CLASS(wxSound);
{
wxSound_MEMORY,
wxSound_FILE,
wxSound_RESOURCE,
wxSound_NONE
} m_type; //mode
}; };
#endif #endif

601
src/osx/carbon/sound.cpp
View File

@@ -14,6 +14,8 @@
#if wxUSE_SOUND #if wxUSE_SOUND
#if wxOSX_USE_QUICKTIME
#include "wx/sound.h" #include "wx/sound.h"
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
@@ -45,396 +47,264 @@
// //
#ifdef __WXMAC__ #ifdef __WXMAC__
#include "wx/osx/uma.h" #include "wx/osx/private.h"
#ifndef __DARWIN__ #if wxOSX_USE_COCOA_OR_CARBON
#include <Movies.h> #include <QuickTime/QuickTimeComponents.h>
#include <Gestalt.h> #endif
#endif
#endif
#if wxOSX_USE_COCOA
#include "wx/osx/private.h"
#endif
#include <Carbon/Carbon.h>
//quicktime media layer only required for mac emulation on pc
#ifndef __WXMAC__
#include <qtml.h>
#endif
#ifndef __DARWIN__
#include <QuickTimeComponents.h>
#else #else
#include <QuickTime/QuickTimeComponents.h> #include <qtml.h>
#endif #endif
//Time between timer calls
#define MOVIE_DELAY 100 #define MOVIE_DELAY 100
static wxTimer* lastSoundTimer=NULL;
static bool lastSoundIsPlaying=false;
#if !defined(__LP64__)
#define USE_QUICKTIME 1
#else
#define USE_QUICKTIME 0
#endif
#if USE_QUICKTIME
// ------------------------------------------------------------------ // ------------------------------------------------------------------
// wxQTTimer - Handle Asyncronous Playing // SoundManager
// ------------------------------------------------------------------ // ------------------------------------------------------------------
class wxQTTimer : public wxTimer
class wxOSXSoundManagerSoundData : public wxSoundData
{ {
public: public:
wxQTTimer(Movie movie, bool bLoop, bool* playing) : wxOSXSoundManagerSoundData(const wxString& fileName);
m_movie(movie), m_bLoop(bLoop), m_pbPlaying(playing) ~wxOSXSoundManagerSoundData();
virtual bool Play(unsigned flags);
virtual void SoundTask();
void DoStop();
protected:
SndListHandle m_hSnd;
SndChannelPtr m_pSndChannel;
};
wxOSXSoundManagerSoundData::wxOSXSoundManagerSoundData(const wxString& fileName) :
m_pSndChannel(NULL)
{
Str255 lpSnd ;
wxMacStringToPascal( fileName , lpSnd ) ;
m_hSnd = (SndListHandle) GetNamedResource('snd ', (const unsigned char *) lpSnd);
}
wxOSXSoundManagerSoundData::~wxOSXSoundManagerSoundData()
{
DoStop();
ReleaseResource((Handle)m_hSnd);
}
void wxOSXSoundManagerSoundData::DoStop()
{
if ( m_pSndChannel )
{ {
SndDisposeChannel(m_pSndChannel, TRUE /* stop immediately, not after playing */);
m_pSndChannel = NULL;
wxSound::SoundStopped(this);
} }
}
virtual ~wxQTTimer() bool wxOSXSoundManagerSoundData::Play(unsigned flags)
{ {
if(m_pbPlaying) Stop();
*m_pbPlaying = false;
StopMovie(m_movie); m_flags = flags;
DisposeMovie(m_movie);
SoundComponentData data;
unsigned long numframes, offset;
ParseSndHeader((SndListHandle)m_hSnd, &data, &numframes, &offset);
SndNewChannel(&m_pSndChannel, sampledSynth,
initNoInterp
+ (data.numChannels == 1 ? initMono : initStereo), NULL);
if(SndPlay(m_pSndChannel, (SndListHandle) m_hSnd, flags & wxSOUND_ASYNC ? 1 : 0) != noErr)
return false;
if (flags & wxSOUND_ASYNC)
CreateAndStartTimer();
else
DoStop();
return true;
}
void wxOSXSoundManagerSoundData::SoundTask()
{
SCStatus stat;
if (SndChannelStatus((SndChannelPtr)m_pSndChannel, sizeof(SCStatus), &stat) != 0)
Stop(); Stop();
//Note that ExitMovies() is not necessary, but //if the sound isn't playing anymore, see if it's looped,
//the docs are fuzzy on whether or not TerminateQTML is //and if so play it again, otherwise close things up
ExitMovies(); if (stat.scChannelBusy == FALSE)
#ifndef __WXMAC__
TerminateQTML();
#endif
}
void Shutdown()
{ {
delete this; if (m_flags & wxSOUND_LOOP)
}
void Notify()
{
if (m_pbPlaying && !*m_pbPlaying)
{ {
Shutdown(); if(SndPlay((SndChannelPtr)m_pSndChannel, (SndListHandle) m_hSnd, true) != noErr)
} Stop();
if(IsMovieDone(m_movie))
{
if (!m_bLoop)
Shutdown();
else
{
StopMovie(m_movie);
GoToBeginningOfMovie(m_movie);
StartMovie(m_movie);
}
} }
else else
MoviesTask(m_movie, MOVIE_DELAY); //Give QT time to play movie Stop();
} }
}
// ------------------------------------------------------------------
// QuickTime
// ------------------------------------------------------------------
Movie& GetMovie() {return m_movie;} bool wxInitQT();
bool wxInitQT()
{
#ifndef __WXMAC__
int nError;
//-2093 no dll
if ((nError = InitializeQTML(0)) != noErr)
{
wxLogSysError(wxString::Format(wxT("Couldn't Initialize Quicktime-%i"), nError));
return false;
}
#endif
EnterMovies();
return true;
}
void wxExitQT();
void wxExitQT()
{
//Note that ExitMovies() is not necessary, but
//the docs are fuzzy on whether or not TerminateQTML is
ExitMovies();
#ifndef __WXMAC__
TerminateQTML();
#endif
}
class wxOSXQuickTimeSoundData : public wxSoundData
{
public:
wxOSXQuickTimeSoundData(const wxString& fileName);
wxOSXQuickTimeSoundData(int size, const wxByte* data);
~wxOSXQuickTimeSoundData();
virtual bool Play(unsigned flags);
virtual void SoundTask();
virtual void DoStop();
protected: protected:
Movie m_movie; Movie m_movie;
bool m_bLoop;
public:
bool* m_pbPlaying;
wxString m_sndname; //file path
Handle m_soundHandle;
}; };
class wxSMTimer : public wxTimer wxOSXQuickTimeSoundData::wxOSXQuickTimeSoundData(const wxString& fileName) :
m_movie(NULL), m_soundHandle(NULL)
{ {
public: m_sndname = fileName;
wxSMTimer(void* hSnd, void* pSndChannel, bool bLoop, bool* playing) }
: m_hSnd(hSnd), m_pSndChannel(pSndChannel), m_bLoop(bLoop), m_pbPlaying(playing)
{
}
virtual ~wxSMTimer() wxOSXQuickTimeSoundData::wxOSXQuickTimeSoundData(int size, const wxByte* data) :
{ m_movie(NULL)
if(m_pbPlaying) {
*m_pbPlaying = false; m_soundHandle = NewHandleClear((Size)size);
SndDisposeChannel((SndChannelPtr)m_pSndChannel, TRUE); BlockMove(data, *m_soundHandle, size);
}
wxOSXQuickTimeSoundData::~wxOSXQuickTimeSoundData()
{
if ( m_soundHandle )
DisposeHandle(m_soundHandle);
}
bool wxOSXQuickTimeSoundData::Play(unsigned flags)
{
if ( m_movie )
Stop(); Stop();
}
void Notify() m_flags = flags;
if (!wxInitQT())
return false;
if( m_soundHandle )
{ {
if (m_pbPlaying && !*m_pbPlaying) Handle dataRef = nil;
MovieImportComponent miComponent;
Track targetTrack = nil;
TimeValue addedDuration = 0;
long outFlags = 0;
OSErr err;
ComponentResult result;
err = PtrToHand(&m_soundHandle, &dataRef, sizeof(Handle));
HLock(m_soundHandle);
if (memcmp(&(*m_soundHandle)[8], "WAVE", 4) == 0)
miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeWave);
else if (memcmp(&(*m_soundHandle)[8], "AIFF", 4) == 0)
miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFF);
else if (memcmp(&(*m_soundHandle)[8], "AIFC", 4) == 0)
miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFC);
else
{ {
Shutdown(); HUnlock(m_soundHandle);
wxLogSysError(wxT("wxSound - Location in memory does not contain valid data"));
return false;
} }
SCStatus stat; HUnlock(m_soundHandle);
m_movie = NewMovie(0);
if (SndChannelStatus((SndChannelPtr)m_pSndChannel, sizeof(SCStatus), &stat) != 0) result = MovieImportDataRef(miComponent, dataRef,
Shutdown(); HandleDataHandlerSubType, m_movie,
nil, &targetTrack,
nil, &addedDuration,
movieImportCreateTrack, &outFlags);
//if the sound isn't playing anymore, see if it's looped, if (result != noErr)
//and if so play it again, otherwise close things up
if (stat.scChannelBusy == FALSE)
{ {
if (m_bLoop) wxLogSysError(wxString::Format(wxT("Couldn't import movie data\nError:%i"), (int)result));
{
if(SndPlay((SndChannelPtr)m_pSndChannel, (SndListHandle) m_hSnd, true) != noErr)
Shutdown();
}
else
Shutdown();
} }
}
void Shutdown() SetMovieVolume(m_movie, kFullVolume);
{ GoToBeginningOfMovie(m_movie);
delete this;
}
void* GetChannel() {return m_pSndChannel;}
protected:
void* m_hSnd;
void* m_pSndChannel;
bool m_bLoop;
public:
bool* m_pbPlaying;
};
// ------------------------------------------------------------------
// wxSound
// ------------------------------------------------------------------
//Determines whether version 4 of QT is installed
Boolean wxIsQuickTime4Installed (void)
{
#ifdef __WXMAC__
short error;
long result;
error = Gestalt (gestaltQuickTime, &result);
return (error == noErr) && (((result >> 16) & 0xffff) >= 0x0400);
#else
return true;
#endif
}
inline bool wxInitQT ()
{
if (wxIsQuickTime4Installed())
{
#ifndef __WXMAC__
int nError;
//-2093 no dll
if ((nError = InitializeQTML(0)) != noErr)
{
wxLogSysError(wxString::Format(wxT("Couldn't Initialize Quicktime-%i"), nError));
}
#endif
EnterMovies();
return true;
} }
else else
{ {
wxLogSysError(wxT("Quicktime is not installed, or Your Version of Quicktime is <= 4.")); OSErr err = noErr ;
return false;
}
}
#endif Handle dataRef = NULL;
OSType dataRefType;
wxSound::wxSound() err = QTNewDataReferenceFromFullPathCFString(wxCFStringRef(m_sndname,wxLocale::GetSystemEncoding()),
: m_hSnd(NULL), m_waveLength(0), m_pTimer(NULL), m_type(wxSound_NONE) (UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType);
{
}
wxSound::wxSound(const wxString& sFileName, bool isResource) wxASSERT(err == noErr);
: m_hSnd(NULL), m_waveLength(0), m_pTimer(NULL), m_type(wxSound_NONE)
{
Create(sFileName, isResource);
}
wxSound::wxSound(int size, const wxByte* data) if (NULL != dataRef || err != noErr)
: m_hSnd((char*)data), m_waveLength(size), m_pTimer(NULL), m_type(wxSound_MEMORY)
{
}
wxSound::~wxSound()
{
}
bool wxSound::Create(const wxString& fileName, bool isResource)
{
Stop();
if (isResource)
{
#ifdef __WXMAC__
m_type = wxSound_RESOURCE;
Str255 lpSnd ;
wxMacStringToPascal( fileName , lpSnd ) ;
m_sndname = fileName;
m_hSnd = (char*) GetNamedResource('snd ', (const unsigned char *) lpSnd);
#else
return false;
#endif
}
else
{
m_type = wxSound_FILE;
m_sndname = fileName;
}
return true;
}
bool wxSound::DoPlay(unsigned flags) const
{
Stop();
#if USE_QUICKTIME
Movie movie;
switch(m_type)
{
case wxSound_MEMORY:
{ {
if (!wxInitQT()) err = NewMovieFromDataRef( &m_movie, newMovieDontAskUnresolvedDataRefs , NULL, dataRef, dataRefType );
return false;
Handle myHandle, dataRef = nil;
MovieImportComponent miComponent;
Track targetTrack = nil;
TimeValue addedDuration = 0;
long outFlags = 0;
OSErr err;
ComponentResult result;
myHandle = NewHandleClear((Size)m_waveLength);
BlockMove(m_hSnd, *myHandle, m_waveLength);
err = PtrToHand(&myHandle, &dataRef, sizeof(Handle));
if (memcmp(&m_hSnd[8], "WAVE", 4) == 0)
miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeWave);
else if (memcmp(&m_hSnd[8], "AIFF", 4) == 0)
miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFF);
else if (memcmp(&m_hSnd[8], "AIFC", 4) == 0)
miComponent = OpenDefaultComponent(MovieImportType, kQTFileTypeAIFC);
else
{
wxLogSysError(wxT("wxSound - Location in memory does not contain valid data"));
return false;
}
movie = NewMovie(0);
result = MovieImportDataRef(miComponent, dataRef,
HandleDataHandlerSubType, movie,
nil, &targetTrack,
nil, &addedDuration,
movieImportCreateTrack, &outFlags);
if (result != noErr)
{
wxLogSysError(wxString::Format(wxT("Couldn't import movie data\nError:%i"), (int)result));
}
SetMovieVolume(movie, kFullVolume);
GoToBeginningOfMovie(movie);
DisposeHandle(myHandle);
}
break;
case wxSound_RESOURCE:
{
SoundComponentData data;
unsigned long numframes, offset;
ParseSndHeader((SndListHandle)m_hSnd, &data, &numframes, &offset);
//m_waveLength = numFrames * data.numChannels;
SndChannelPtr pSndChannel;
SndNewChannel(&pSndChannel, sampledSynth,
initNoInterp
+ (data.numChannels == 1 ? initMono : initStereo), NULL);
if(SndPlay(pSndChannel, (SndListHandle) m_hSnd, flags & wxSOUND_ASYNC ? 1 : 0) != noErr)
return false;
if (flags & wxSOUND_ASYNC)
{
lastSoundTimer = ((wxSMTimer*&)m_pTimer)
= new wxSMTimer(pSndChannel, m_hSnd, flags & wxSOUND_LOOP ? 1 : 0,
&lastSoundIsPlaying);
lastSoundIsPlaying = true;
((wxTimer*)m_pTimer)->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
}
else
SndDisposeChannel(pSndChannel, TRUE);
return true;
}
break;
case wxSound_FILE:
{
if (!wxInitQT())
return false;
OSErr err = noErr ;
Handle dataRef = NULL;
OSType dataRefType;
err = QTNewDataReferenceFromFullPathCFString(wxCFStringRef(m_sndname,wxLocale::GetSystemEncoding()),
(UInt32)kQTNativeDefaultPathStyle, 0, &dataRef, &dataRefType);
wxASSERT(err == noErr); wxASSERT(err == noErr);
DisposeHandle(dataRef);
if (NULL != dataRef || err != noErr)
{
err = NewMovieFromDataRef( &movie, newMovieDontAskUnresolvedDataRefs , NULL, dataRef, dataRefType );
wxASSERT(err == noErr);
DisposeHandle(dataRef);
}
if (err != noErr)
{
wxLogSysError(
wxString::Format(wxT("wxSound - Could not open file: %s\nError:%i"), m_sndname.c_str(), err )
);
return false;
}
} }
break;
default:
return false;
}//end switch(m_type)
//Start the movie! if (err != noErr)
StartMovie(movie); {
wxLogSysError(
wxString::Format(wxT("wxSound - Could not open file: %s\nError:%i"), m_sndname.c_str(), err )
);
return false;
}
}
//Start the m_movie!
StartMovie(m_movie);
if (flags & wxSOUND_ASYNC) if (flags & wxSOUND_ASYNC)
{ {
//Start timer and play movie asyncronously CreateAndStartTimer();
lastSoundTimer = ((wxQTTimer*&)m_pTimer) =
new wxQTTimer(movie, flags & wxSOUND_LOOP ? 1 : 0,
&lastSoundIsPlaying);
lastSoundIsPlaying = true;
((wxQTTimer*)m_pTimer)->Start(MOVIE_DELAY, wxTIMER_CONTINUOUS);
} }
else else
{ {
@@ -443,40 +313,59 @@ bool wxSound::DoPlay(unsigned flags) const
//Play movie until it ends, then exit //Play movie until it ends, then exit
//Note that due to quicktime caching this may not always //Note that due to quicktime caching this may not always
//work 100% correctly //work 100% correctly
while (!IsMovieDone(movie)) while (!IsMovieDone(m_movie))
MoviesTask(movie, 1); MoviesTask(m_movie, 1);
DisposeMovie(movie); DoStop();
} }
#endif
return true; return true;
} }
bool wxSound::IsPlaying() void wxOSXQuickTimeSoundData::DoStop()
{ {
return lastSoundIsPlaying; if( m_movie )
}
void wxSound::Stop()
{
if (lastSoundIsPlaying)
{ {
delete (wxTimer*&) lastSoundTimer; StopMovie(m_movie);
lastSoundIsPlaying = false; DisposeMovie(m_movie);
lastSoundTimer = NULL; m_movie = NULL;
wxSound::SoundStopped(this);
wxExitQT();
} }
} }
void* wxSound::GetHandle() void wxOSXQuickTimeSoundData::SoundTask()
{ {
#if USE_QUICKTIME if(IsMovieDone(m_movie))
if(m_type == wxSound_RESOURCE) {
return (void*) ((wxSMTimer*)m_pTimer)->GetChannel(); if (m_flags & wxSOUND_LOOP)
{
return (void*) ((wxQTTimer*) m_pTimer)->GetMovie(); StopMovie(m_movie);
#endif GoToBeginningOfMovie(m_movie);
return NULL; StartMovie(m_movie);
}
else
Stop();
}
else
MoviesTask(m_movie, MOVIE_DELAY); //Give QT time to play movie
} }
bool wxSound::Create(int size, const wxByte* data)
{
m_data = new wxOSXQuickTimeSoundData(size,data);
return true;
}
bool wxSound::Create(const wxString& fileName, bool isResource)
{
if ( isResource )
m_data = new wxOSXSoundManagerSoundData(fileName);
else
m_data = new wxOSXQuickTimeSoundData(fileName);
return true;
}
#endif // wxOSX_USE_QUICKTIME
#endif //wxUSE_SOUND #endif //wxUSE_SOUND