diff options
| author | magumagu <magumagu9@gmail.com> | 2014-03-26 11:17:19 -0700 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2014-03-26 11:17:19 -0700 |
| commit | ae9367a89bd39cbc1f196fd3fcf7458fcf2c75d6 (patch) | |
| tree | ede663e41034c0e200cc8a0448c6a1cc6f03ee24 /Source/Core/AudioCommon | |
| parent | ea6b37cb750e8cefd60a18a9ed1b5aa0dd4adf8c (diff) | |
Delete a bunch of old audio HLE cruft.
This commit intentionally breaks audio output from HLE Zelda UCode; no other functional change.
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.h | 8 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp index 2b785ffaf4..fa43baeb99 100644 --- a/Source/Core/AudioCommon/Mixer.cpp +++ b/Source/Core/AudioCommon/Mixer.cpp @@ -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); diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index a892618cca..f7fcdbf14b 100644 --- a/Source/Core/AudioCommon/Mixer.h +++ b/Source/Core/AudioCommon/Mixer.h @@ -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; |