actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

style

Browse Source
This commit is contained in:
Glenn Maynard
2005-12-07 03:03:21 +00:00
parent 321931c19a
commit 6497ac8f94
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
+27 -27
View File
@@ -33,8 +33,8 @@ static int g_iNumIOProcCalls = 0;
RageSound_CA::RageSound_CA() RageSound_CA::RageSound_CA()
{ {
mOutputDevice = NULL; m_pOutputDevice = NULL;
mConverter = NULL; m_Converter = NULL;
} }
CString RageSound_CA::Init() CString RageSound_CA::Init()
@@ -42,34 +42,34 @@ CString RageSound_CA::Init()
try try
{ {
AudioDeviceID dID = CAAudioHardwareSystem::GetDefaultDevice( false, false ); AudioDeviceID dID = CAAudioHardwareSystem::GetDefaultDevice( false, false );
mOutputDevice = new CAAudioHardwareDevice( dID ); m_pOutputDevice = new CAAudioHardwareDevice( dID );
} }
catch( const CAException& e ) catch( const CAException& e )
{ {
return "Couldn't create default output device."; return "Couldn't create default output device.";
} }
mSampleRate = PREFSMAN->m_iSoundPreferredSampleRate; m_iSampleRate = PREFSMAN->m_iSoundPreferredSampleRate;
Float64 nominalSampleRate = mSampleRate; Float64 nominalSampleRate = m_iSampleRate;
try try
{ {
mOutputDevice->SetNominalSampleRate(nominalSampleRate); m_pOutputDevice->SetNominalSampleRate(nominalSampleRate);
LOG->Info( "Set the nominal sample rate to %f.", nominalSampleRate ); LOG->Info( "Set the nominal sample rate to %f.", nominalSampleRate );
} }
catch( const CAException& e ) catch( const CAException& e )
{ {
LOG->Warn( "Couldn't set the nominal sample rate." ); LOG->Warn( "Couldn't set the nominal sample rate." );
nominalSampleRate = mOutputDevice->GetNominalSampleRate(); nominalSampleRate = m_pOutputDevice->GetNominalSampleRate();
LOG->Warn( "Device's nominal sample rate is %f", nominalSampleRate ); LOG->Warn( "Device's nominal sample rate is %f", nominalSampleRate );
mSampleRate = int( nominalSampleRate ); m_iSampleRate = int( nominalSampleRate );
} }
AudioStreamID sID = mOutputDevice->GetStreamByIndex( kAudioDeviceSectionOutput, 0 ); AudioStreamID sID = m_pOutputDevice->GetStreamByIndex( kAudioDeviceSectionOutput, 0 );
CAAudioHardwareStream stream( sID ); CAAudioHardwareStream stream( sID );
try try
{ {
mOutputDevice->AddPropertyListener( kAudioPropertyWildcardChannel, kAudioPropertyWildcardSection, m_pOutputDevice->AddPropertyListener( kAudioPropertyWildcardChannel, kAudioPropertyWildcardSection,
kAudioDeviceProcessorOverload, OverloadListener, this ); kAudioDeviceProcessorOverload, OverloadListener, this );
} }
catch( const CAException& e ) catch( const CAException& e )
@@ -93,14 +93,14 @@ CString RageSound_CA::Init()
stream.GetCurrentIOProcFormat( IOProcFormat ); stream.GetCurrentIOProcFormat( IOProcFormat );
} }
if( AudioConverterNew(&SMFormat, &IOProcFormat, &mConverter) ) if( AudioConverterNew(&SMFormat, &IOProcFormat, &m_Converter) )
return "Couldn't create the audio converter"; return "Couldn't create the audio converter";
UInt32 bufferSize; UInt32 bufferSize;
try try
{ {
bufferSize = mOutputDevice->GetIOBufferSize(); bufferSize = m_pOutputDevice->GetIOBufferSize();
LOG->Info("I/O Buffer size: %lu frames", bufferSize); LOG->Info("I/O Buffer size: %lu frames", bufferSize);
} }
catch( const CAException& e ) catch( const CAException& e )
@@ -111,7 +111,7 @@ CString RageSound_CA::Init()
try try
{ {
UInt32 frames = mOutputDevice->GetLatency( kAudioDeviceSectionOutput ); UInt32 frames = m_pOutputDevice->GetLatency( kAudioDeviceSectionOutput );
if( stream.HasProperty(0, kAudioDevicePropertyLatency) ) if( stream.HasProperty(0, kAudioDevicePropertyLatency) )
{ {
UInt32 t, size = 4; UInt32 t, size = 4;
@@ -124,11 +124,11 @@ CString RageSound_CA::Init()
{ {
LOG->Warn( "Stream does not report latency." ); LOG->Warn( "Stream does not report latency." );
} }
frames += mOutputDevice->GetSafetyOffset( kAudioDeviceSectionOutput ); frames += m_pOutputDevice->GetSafetyOffset( kAudioDeviceSectionOutput );
frames += bufferSize; frames += bufferSize;
mLatency = frames / nominalSampleRate; m_fLatency = frames / nominalSampleRate;
LOG->Info( "Frames of latency: %lu\n" LOG->Info( "Frames of latency: %lu\n"
"Seconds of latency: %f", frames, mLatency ); "Seconds of latency: %f", frames, m_fLatency );
} }
catch( const CAException& e ) catch( const CAException& e )
{ {
@@ -139,8 +139,8 @@ CString RageSound_CA::Init()
try try
{ {
mOutputDevice->AddIOProc( GetData, this ); m_pOutputDevice->AddIOProc( GetData, this );
mOutputDevice->StartIOProc( GetData ); m_pOutputDevice->StartIOProc( GetData );
} }
catch( const CAException& e ) catch( const CAException& e )
{ {
@@ -151,15 +151,15 @@ CString RageSound_CA::Init()
RageSound_CA::~RageSound_CA() RageSound_CA::~RageSound_CA()
{ {
if( mOutputDevice != NULL ) if( m_pOutputDevice != NULL )
{ {
mOutputDevice->StopIOProc( GetData ); m_pOutputDevice->StopIOProc( GetData );
mOutputDevice->RemoveIOProc( GetData ); m_pOutputDevice->RemoveIOProc( GetData );
} }
delete mOutputDevice; delete m_pOutputDevice;
if( mConverter != NULL ) if( m_Converter != NULL )
AudioConverterDispose( mConverter ); AudioConverterDispose( m_Converter );
} }
int64_t RageSound_CA::GetPosition( const RageSoundBase *sound ) const int64_t RageSound_CA::GetPosition( const RageSoundBase *sound ) const
@@ -171,12 +171,12 @@ int64_t RageSound_CA::GetPosition( const RageSoundBase *sound ) const
inTime.mHostTime = AudioGetCurrentHostTime(); inTime.mHostTime = AudioGetCurrentHostTime();
inTime.mFlags = kAudioTimeStampHostTimeValid; inTime.mFlags = kAudioTimeStampHostTimeValid;
outTime.mFlags = kAudioTimeStampSampleTimeValid; outTime.mFlags = kAudioTimeStampSampleTimeValid;
mOutputDevice->TranslateTime(inTime, outTime); m_pOutputDevice->TranslateTime(inTime, outTime);
return int64_t(outTime.mSampleTime); return int64_t(outTime.mSampleTime);
#else #else
AudioTimeStamp time; AudioTimeStamp time;
mOutputDevice->GetCurrentTime( time ); m_pOutputDevice->GetCurrentTime( time );
return int64_t( time.mSampleTime ); return int64_t( time.mSampleTime );
#endif #endif
} }
@@ -204,7 +204,7 @@ OSStatus RageSound_CA::GetData( AudioDeviceID inDevice,
++g_iLastMixTimePos; ++g_iLastMixTimePos;
wrap( g_iLastMixTimePos, NUM_MIX_TIMES ); wrap( g_iLastMixTimePos, NUM_MIX_TIMES );
AudioConverterConvertBuffer( This->mConverter, dataPackets * kBytesPerPacket, AudioConverterConvertBuffer( This->m_Converter, dataPackets * kBytesPerPacket,
buffer, &buf.mDataByteSize, buf.mData ); buffer, &buf.mDataByteSize, buf.mData );
g_fLastIOProcTime = tm.GetDeltaTime(); g_fLastIOProcTime = tm.GetDeltaTime();
stepmania/src/arch/Sound/RageSoundDriver_CA.h
+6 -6
View File
@@ -21,16 +21,16 @@ public:
RageSound_CA(); RageSound_CA();
CString Init(); CString Init();
~RageSound_CA(); ~RageSound_CA();
float GetPlayLatency() const { return mLatency; } float GetPlayLatency() const { return m_fLatency; }
int GetSampleRate( int rate ) const { return mSampleRate; } int GetSampleRate( int rate ) const { return m_iSampleRate; }
int64_t GetPosition( const RageSoundBase *sound ) const; int64_t GetPosition( const RageSoundBase *sound ) const;
void SetupDecodingThread(); void SetupDecodingThread();
private: private:
float mLatency; float m_fLatency;
CAAudioHardwareDevice *mOutputDevice; CAAudioHardwareDevice *m_pOutputDevice;
AudioConverterRef mConverter; AudioConverterRef m_Converter;
int mSampleRate; int m_iSampleRate;
static OSStatus GetData( AudioDeviceID inDevice, static OSStatus GetData( AudioDeviceID inDevice,
const AudioTimeStamp *inNow, const AudioTimeStamp *inNow,