razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fix tsound_mac.cpp

Browse source
This commit is contained in:
Shinya Kitaoka 2016-04-15 17:55:14 +09:00
parent 387b337fba
commit 94f329e8fb
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
toonz/sources/common/tsound/tsound_mac.cpp
View file

@ -22,7 +22,7 @@ namespace
TThread::Mutex MutexOut; TThread::Mutex MutexOut;
} }
class TSoundOutputDeviceImp class TSoundOutputDeviceImp : public std::enable_shared_from_this<TSoundOutputDeviceImp>
{ {
public: public:
bool m_isPlaying; bool m_isPlaying;
@ -65,10 +65,18 @@ struct MyData {
void *sourceBuffer; void *sourceBuffer;
AudioConverterRef converter; AudioConverterRef converter;
TSoundOutputDeviceImp *imp; std::shared_ptr<TSoundOutputDeviceImp> imp;
bool isLooping; bool isLooping;
MyData() MyData()
: entireFileBuffer(0), totalPacketCount(0), fileByteCount(0), maxPacketSize(0), packetOffset(0), byteOffset(0), sourceBuffer(0), isLooping(false), imp(0), m_doNotify(true) : entireFileBuffer(0)
, totalPacketCount(0)
, fileByteCount(0)
, maxPacketSize(0)
, packetOffset(0)
, byteOffset(0)
, sourceBuffer(0)
, isLooping(false)
, m_doNotify(true)
{ {
} }
}; };
@ -341,7 +349,6 @@ TSoundOutputDevice::~TSoundOutputDevice()
{ {
stop(); stop();
close(); close();
delete m_imp;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -415,7 +422,7 @@ void TSoundOutputDeviceImp::play(const TSoundTrackP &st, TINT32 s0, TINT32 s1, b
OSStatus err = noErr; OSStatus err = noErr;
MyData *myData = new MyData(); MyData *myData = new MyData();
myData->imp = this; myData->imp = shared_from_this();
UInt32 magicCookieSize = 0; UInt32 magicCookieSize = 0;
//PrintStreamDesc(&outputASBD); //PrintStreamDesc(&outputASBD);
err = AudioConverterNew(&fileASBD, &outputASBD, &converter); err = AudioConverterNew(&fileASBD, &outputASBD, &converter);
@ -710,11 +717,6 @@ TSoundInputDevice::TSoundInputDevice() : m_imp(new TSoundInputDeviceImp)
TSoundInputDevice::~TSoundInputDevice() TSoundInputDevice::~TSoundInputDevice()
{ {
/*
if(m_imp->m_port)
alClosePort(m_imp->m_port);
delete m_imp;
*/
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
toonz/sources/include/tsound.h
View file

@ -360,7 +360,7 @@ class TSoundOutputDeviceImp;
*/ */
class DVAPI TSoundOutputDevice class DVAPI TSoundOutputDevice
{ {
std::unique_ptr<TSoundOutputDeviceImp> m_imp; std::shared_ptr<TSoundOutputDeviceImp> m_imp;
public: public:
TSoundOutputDevice(); TSoundOutputDevice();