piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to move mixer to audio common, it's a bit more complicated than I expected

Browse Source 
so please check I didn't break anything in hle



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2756 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee
2009-03-26 09:29:14 +00:00
parent d7038fea17
commit fff663e8c7
35 changed files with 386 additions and 619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/AudioCommon/Src/AOSoundStream.h
View File

@ -30,8 +30,8 @@ class AOSound : public SoundStream
{
#if defined(HAVE_AO) && HAVE_AO
Common::Thread *thread;
Common::CriticalSection *soundCriticalSection;
Common::Event *soundSyncEvent;
Common::CriticalSection soundCriticalSection;
Common::Event soundSyncEvent;
int buf_size;
@ -42,9 +42,8 @@ class AOSound : public SoundStream
short realtimeBuffer[1024 * 1024];
public:
AOSound(int _sampleRate, StreamCallback _callback) :
SoundStream(_sampleRate, _callback) {}
AOSound(CMixer *mixer) : SoundStream(mixer) {}
virtual ~AOSound() {}
virtual bool Start();
@ -63,14 +62,10 @@ public:
virtual void Update();
virtual int GetSampleRate() {
return sampleRate;
}
#else
public:
AOSound(int _sampleRate, StreamCallback _callback) :
SoundStream(_sampleRate, _callback) {}
AOSound(CMixer *mixer) :
SoundStream(mixer) {}
#endif
};