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

Renamed m_hSnd to m_cocoaNSSound (match rest of wxCocoa).

Browse Source 
Create delegate as a static member shared by all instances.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29974 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2004-10-18 22:12:57 +00:00
parent 2841cdd89b
commit a2c1097b8a
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/cocoa/sound.h
View File

@ -20,6 +20,7 @@
#if wxUSE_SOUND
#include "wx/object.h"
#include "wx/cocoa/ObjcRef.h"
class WXDLLEXPORT wxSound : public wxSoundBase
{
@ -31,20 +32,21 @@ public:
public:
bool Create(const wxString& fileName, bool isResource = false);
bool IsOk() const { return m_hSnd != NULL; }
bool IsOk() const
{ return m_cocoaNSSound; }
static void Stop();
static bool IsPlaying();
inline WX_NSSound GetNSSound()
{ return m_hSnd; }
{ return m_cocoaNSSound; }
protected:
bool DoPlay(unsigned flags) const;
private:
WX_NSSound m_hSnd; //NSSound handle
WX_NSSound m_cocoaNSSound; //NSSound handle
wxString m_sndname; //file path
int m_waveLength; //size of file in memory mode
struct objc_object * m_cocoaSoundDelegate;
static const wxObjcAutoRefFromAlloc<struct objc_object *> sm_cocoaDelegate;
};
#endif

36
src/cocoa/sound.mm
View File

@ -61,39 +61,39 @@ bool isLastSoundInScope = false;
@end // wxNSSoundDelegate
const wxObjcAutoRefFromAlloc<struct objc_object*> wxSound::sm_cocoaDelegate = [[wxNSSoundDelegate alloc] init];
// ------------------------------------------------------------------
// wxSound
// ------------------------------------------------------------------
wxSound::wxSound()
: m_hSnd(NULL)
: m_cocoaNSSound(nil)
, m_waveLength(0)
{
}
wxSound::wxSound(const wxString& sFileName, bool isResource)
: m_hSnd(NULL)
: m_cocoaNSSound(nil)
, m_waveLength(0)
{
Create(sFileName, isResource);
}
wxSound::wxSound(int size, const wxByte* data)
: m_hSnd(NULL)
: m_cocoaNSSound(nil)
, m_waveLength(size)
{
NSData* theData = [[NSData alloc] dataWithBytesNoCopy:(void*)data length:size];
m_hSnd = [[NSSound alloc] initWithData:theData];
m_cocoaNSSound = [[NSSound alloc] initWithData:theData];
m_cocoaSoundDelegate = [[wxNSSoundDelegate alloc] init];
}
wxSound::~wxSound()
{
if (m_hSnd != lastSound)
if (m_cocoaNSSound != lastSound)
{
[m_hSnd release];
[m_cocoaSoundDelegate release];
[m_cocoaNSSound release];
}
else
isLastSoundInScope = false;
@ -108,19 +108,17 @@ bool wxSound::Create(const wxString& fileName, bool isResource)
if (isResource)
{
//oftype could be @"snd" @"wav" or @"aiff"; nil or @"" autodetects (?)
m_hSnd = [[NSSound alloc]
m_cocoaNSSound = [[NSSound alloc]
initWithContentsOfFile:[[NSBundle mainBundle]
pathForResource:wxNSStringWithWxString(fileName)
ofType:nil]
byReference:YES];
}
else
m_hSnd = [[NSSound alloc] initWithContentsOfFile:wxNSStringWithWxString(fileName) byReference:YES];
m_cocoaSoundDelegate = [[wxNSSoundDelegate alloc] init];
m_cocoaNSSound = [[NSSound alloc] initWithContentsOfFile:wxNSStringWithWxString(fileName) byReference:YES];
m_sndname = fileName;
return m_hSnd != nil;
return m_cocoaNSSound;
}
bool wxSound::DoPlay(unsigned flags) const
@ -132,20 +130,20 @@ bool wxSound::DoPlay(unsigned flags) const
if (flags & wxSOUND_ASYNC)
{
lastSound = m_hSnd;
lastSound = m_cocoaNSSound;
isLastSoundLooping = (flags & wxSOUND_LOOP) == wxSOUND_LOOP;
isLastSoundInScope = true;
[m_hSnd setDelegate:m_cocoaSoundDelegate];
return [m_hSnd play];
[m_cocoaNSSound setDelegate:sm_cocoaDelegate];
return [m_cocoaNSSound play];
}
else
{
[m_hSnd setDelegate:nil];
[m_cocoaNSSound setDelegate:nil];
//play until done
bool bOK = [m_hSnd play];
bool bOK = [m_cocoaNSSound play];
while ([m_hSnd isPlaying])
while ([m_cocoaNSSound isPlaying])
{
wxTheApp->Yield(false);
}