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

Delete a bunch of old audio HLE cruft.

Browse Source 
This commit intentionally breaks audio output from HLE Zelda UCode; no other functional change.
This commit is contained in:
magumagu
2014-03-26 11:17:19 -07:00
parent ea6b37cb75
commit ae9367a89b
14 changed files with 6 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/AudioCommon/Mixer.cpp
View File

@ -99,9 +99,6 @@ unsigned int CMixer::Mix(short* samples, unsigned int numSamples, bool consider_
// Flush cached variable
Common::AtomicStore(m_indexR, indexR);
// Add the DSPHLE sound, re-sampling is done inside
Premix(samples, numSamples);
// Add the DTK Music
// Re-sampling is done inside
AudioInterface::Callback_GetStreaming(samples, numSamples, m_sampleRate);

8
Source/Core/AudioCommon/Mixer.h
View File

@ -26,7 +26,6 @@ public:
, m_dacSampleRate(DACSampleRate)
, m_bits(16)
, m_channels(2)
, m_HLEready(false)
, m_logAudio(0)
, m_indexW(0)
, m_indexR(0)
@ -45,7 +44,6 @@ public:
// Called from audio threads
virtual unsigned int Mix(short* samples, unsigned int numSamples, bool consider_framelimit = true);
virtual void Premix(short * /*samples*/, unsigned int /*numSamples*/) {}
// Called from main thread
virtual void PushSamples(const short* samples, unsigned int num_samples);
@ -53,11 +51,6 @@ public:
void SetThrottle(bool use) { m_throttle = use;}
// TODO: do we need this
bool IsHLEReady() const { return m_HLEready;}
void SetHLEReady(bool ready) { m_HLEready = ready;}
// ---------------------
virtual void StartLogAudio(const std::string& filename)
{
@ -102,7 +95,6 @@ protected:
WaveFileWriter g_wave_writer;
bool m_HLEready;
bool m_logAudio;
bool m_throttle;