ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

soundBufferTotalLen is in DirectSound.cpp now 

Added correct sound device selection in OpenAL

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@170 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
mudlord 2007-12-06 13:54:29 +00:00
parent 028e88e0de
commit 2dabc9c2d9
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Sound.cpp
View File

@ -51,7 +51,7 @@ int soundTicks = SOUND_CLOCK_TICKS_;
u16 soundFinalWave [1470]; u16 soundFinalWave [1470];
int soundBufferLen = 1470; int soundBufferLen = 1470;
int soundBufferTotalLen = 14700;
int soundDebug = 0; int soundDebug = 0;
u32 soundNextPosition = 0; u32 soundNextPosition = 0;

3
src/win32/DirectSound.cpp
View File

@ -35,6 +35,7 @@
#pragma comment( lib, "Dsound" ) #pragma comment( lib, "Dsound" )
#pragma comment( lib, "Dxguid" ) #pragma comment( lib, "Dxguid" )
int soundBufferTotalLen = 14700;
extern bool soundBufferLow; extern bool soundBufferLow;
extern void setsystemSoundOn(bool value); extern void setsystemSoundOn(bool value);
@ -48,6 +49,7 @@ private:
HANDLE dsbEvent; HANDLE dsbEvent;
WAVEFORMATEX wfx; // Primary buffer wave format WAVEFORMATEX wfx; // Primary buffer wave format
public: public:
DirectSound(); DirectSound();
virtual ~DirectSound(); virtual ~DirectSound();
@ -69,6 +71,7 @@ DirectSound::DirectSound()
dsbSecondary = NULL; dsbSecondary = NULL;
dsbNotify = NULL; dsbNotify = NULL;
dsbEvent = NULL; dsbEvent = NULL;
} }

6
src/win32/OpenAL.cpp
View File

@ -160,11 +160,7 @@ bool OpenAL::init()
winlog( "OpenAL::init\n" ); winlog( "OpenAL::init\n" );
assert( initialized == false ); assert( initialized == false );
if (theApp.OpenALAudiomixing) device = alcOpenDevice( theApp.OpenALAudiomixing ? "Generic Software" : NULL );
{
device = alcOpenDevice( "Generic Software" );
}
device = alcOpenDevice( NULL );
assert( device != NULL ); assert( device != NULL );
context = alcCreateContext( device, NULL ); context = alcCreateContext( device, NULL );