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

Add suggested changes.

Browse Source
This commit is contained in:
Steve Checkoway
2004-05-16 08:09:36 +00:00
parent 04a74a4455
commit 7e72d8d532
1 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/Sound/RageSoundDriver_CA.cpp
+29 -4
View File
@@ -1,4 +1,5 @@
#include "global.h" #include "global.h"
#include "RageUtil.h"
#include "RageSoundDriver_CA.h" #include "RageSoundDriver_CA.h"
#include "CAHelpers.h" #include "CAHelpers.h"
#include "RageLog.h" #include "RageLog.h"
@@ -15,6 +16,22 @@
static AudioConverter *gConverter; static AudioConverter *gConverter;
static CString FormatToString( int fmt )
{
char c[4];
c[0] = (fmt >> 24) & 0xFF;
c[1] = (fmt >> 16) & 0xFF;
c[2] = (fmt >> 8) & 0xFF;
c[3] = (fmt) & 0xFF;
/* Sanitize: */
for( int i = 0; i < 4; ++i )
if( c[i] < 32 || c[i] >= 127 )
return ssprintf( "0x%X", fmt );
return ssprintf( "%c%c%c%c", c[0], c[1], c[2], c[3] );
}
static Desc FindClosestFormat(const vector<Desc>& formats) static Desc FindClosestFormat(const vector<Desc>& formats)
{ {
vector<Desc> v; vector<Desc> v;
@@ -90,6 +107,14 @@ RageSound_CA::RageSound_CA()
RageException::ThrowNonfatal("Couldn't create default output device."); RageException::ThrowNonfatal("Couldn't create default output device.");
} }
try
{
mOutputDevice->SetNominalSampleRate(44100.0);
}
catch (const CAException& e)
{
RageException::ThrowNonfatal("Couldn't set the nominal sample rate.");
}
AudioStreamID sID = mOutputDevice->GetStreamByIndex( kAudioDeviceSectionOutput, 0 ); AudioStreamID sID = mOutputDevice->GetStreamByIndex( kAudioDeviceSectionOutput, 0 );
CAAudioHardwareStream stream( sID ); CAAudioHardwareStream stream( sID );
@@ -114,8 +139,8 @@ RageSound_CA::RageSound_CA()
{ {
const Desc& f = physicalFormats[i]; const Desc& f = physicalFormats[i];
LOG->Info("Format %u: Rate: %i ID: %lu Flags 0x%lx bpp %lu fpp %lu bpf %lu channels %lu bits %lu", LOG->Info("Format %u: Rate: %i ID: %s Flags 0x%lx bpp %lu fpp %lu bpf %lu channels %lu bits %lu",
i, (int) f.mSampleRate, f.mFormatID, f.mFormatFlags, i, (int) f.mSampleRate, FormatToString(f.mFormatID).c_str(), f.mFormatFlags,
f.mBytesPerPacket, f.mFramesPerPacket, f.mBytesPerFrame, f.mBytesPerPacket, f.mFramesPerPacket, f.mBytesPerFrame,
f.mChannelsPerFrame, f.mBitsPerChannel); f.mChannelsPerFrame, f.mBitsPerChannel);
} }
@@ -129,8 +154,8 @@ RageSound_CA::RageSound_CA()
{ {
const Desc& f = procFormats[i]; const Desc& f = procFormats[i];
LOG->Info("Format %u: Rate: %i ID: %lu Flags 0x%lx bpp %lu fpp %lu bpf %lu channels %lu bits %lu", LOG->Info("Format %u: Rate: %i ID: %s Flags 0x%lx bpp %lu fpp %lu bpf %lu channels %lu bits %lu",
i, (int) f.mSampleRate, f.mFormatID, f.mFormatFlags, i, (int) f.mSampleRate, FormatToString(f.mFormatID).c_str(), f.mFormatFlags,
f.mBytesPerPacket, f.mFramesPerPacket, f.mBytesPerFrame, f.mBytesPerPacket, f.mFramesPerPacket, f.mBytesPerFrame,
f.mChannelsPerFrame, f.mBitsPerChannel); f.mChannelsPerFrame, f.mBitsPerChannel);
} }