Fix another potential memory leak.

Be consistent with respect to static vs. anonymous namespaces.
This commit is contained in:
Steve Checkoway
2004-03-28 22:37:12 +00:00
parent a84e14ae05
commit 06a900de08
2 changed files with 7 additions and 9 deletions
-1
View File
@@ -44,4 +44,3 @@ OSStatus AudioConverter::FormatConverterInputProc(UInt32& ioNumberDataPackets,
buf.mData = mBuffer; buf.mData = mBuffer;
return noErr; return noErr;
} }
@@ -11,11 +11,7 @@
#include <mach/thread_act.h> #include <mach/thread_act.h>
#include <mach/mach_init.h> #include <mach/mach_init.h>
namespace static AudioConverter *gConverter;
{
AudioConverter *gConverter;
}
static Desc FindClosestFormat(const vector<Desc>& formats) static Desc FindClosestFormat(const vector<Desc>& formats)
{ {
@@ -91,10 +87,11 @@ RageSound_CA::RageSound_CA()
try try
{ {
UInt32 frames = mOutputDevice->GetLatency(kAudioDeviceSectionOutput); UInt32 frames = mOutputDevice->GetLatency(kAudioDeviceSectionOutput);
mLatency = frames / 44100.0; // maybe? I'm tired, I don't know. mLatency = frames / 44100.0;
} }
catch (const CAException& e) catch (const CAException& e)
{ {
delete mOutputDevice;
RageException::ThrowNonfatal("Couldn't get Latency."); RageException::ThrowNonfatal("Couldn't get Latency.");
} }
@@ -123,6 +120,7 @@ RageSound_CA::RageSound_CA()
catch(const CAException& e) catch(const CAException& e)
{ {
delete gConverter; delete gConverter;
delete mOutputDevice;
RageException::Throw("Couldn't start the IOProc."); RageException::Throw("Couldn't start the IOProc.");
} }
} }
@@ -171,6 +169,7 @@ void RageSound_CA::SetupDecodingThread()
/* Increase the scheduling precedence of the decoder thread. */ /* Increase the scheduling precedence of the decoder thread. */
thread_precedence_policy po; thread_precedence_policy po;
po.importance = 5; po.importance = 5;
thread_policy_set( mach_thread_self(), THREAD_PRECEDENCE_POLICY, (int *)&po, THREAD_PRECEDENCE_POLICY_COUNT ); thread_policy_set( mach_thread_self(), THREAD_PRECEDENCE_POLICY,
(int *)&po, THREAD_PRECEDENCE_POLICY_COUNT );
} }