summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2014-07-26 19:22:37 +0200
committerPierre Bourdon <delroth@gmail.com>2014-07-26 19:22:37 +0200
commit6bd5fb3a67a7a649533b072e926619a027f2da5f (patch)
treebb0608cb7aff82b3d11e92b3084c23bc07e4b595 /Source/Core/AudioCommon
parentf343f4103d8c8c8ee4d9acafcc98a34503857d91 (diff)
parent7d920bbb3a0f84e2dcd6bc123e9501435a846a9f (diff)
Merge pull request #666 from booto/audio-dma-sampling
AudioCommon/Mixer: Allow input sample rate changes
Diffstat (limited to 'Source/Core/AudioCommon')
-rw-r--r--Source/Core/AudioCommon/Mixer.cpp15
-rw-r--r--Source/Core/AudioCommon/Mixer.h4
2 files changed, 19 insertions, 0 deletions
diff --git a/Source/Core/AudioCommon/Mixer.cpp b/Source/Core/AudioCommon/Mixer.cpp
index ce13f50689..ca61aef37d 100644
--- a/Source/Core/AudioCommon/Mixer.cpp
+++ b/Source/Core/AudioCommon/Mixer.cpp
@@ -181,11 +181,26 @@ void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples
m_streaming_mixer.PushSamples(samples, num_samples);
}
+void CMixer::SetDMAInputSampleRate(unsigned int rate)
+{
+ m_dma_mixer.SetInputSampleRate(rate);
+}
+
+void CMixer::SetStreamInputSampleRate(unsigned int rate)
+{
+ m_streaming_mixer.SetInputSampleRate(rate);
+}
+
void CMixer::SetStreamingVolume(unsigned int lvolume, unsigned int rvolume)
{
m_streaming_mixer.SetVolume(lvolume, rvolume);
}
+void CMixer::MixerFifo::SetInputSampleRate(unsigned int rate)
+{
+ m_input_sample_rate = rate;
+}
+
void CMixer::MixerFifo::SetVolume(unsigned int lvolume, unsigned int rvolume)
{
m_LVolume = lvolume + (lvolume >> 7);
diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h
index 474ec128bb..8ca5c662f1 100644
--- a/Source/Core/AudioCommon/Mixer.h
+++ b/Source/Core/AudioCommon/Mixer.h
@@ -41,6 +41,9 @@ public:
virtual void PushSamples(const short* samples, unsigned int num_samples);
virtual void PushStreamingSamples(const short* samples, unsigned int num_samples);
unsigned int GetSampleRate() const { return m_sampleRate; }
+
+ void SetDMAInputSampleRate(unsigned int rate);
+ void SetStreamInputSampleRate(unsigned int rate);
void SetStreamingVolume(unsigned int lvolume, unsigned int rvolume);
void SetThrottle(bool use) { m_throttle = use;}
@@ -97,6 +100,7 @@ protected:
}
void PushSamples(const short* samples, unsigned int num_samples);
unsigned int Mix(short* samples, unsigned int numSamples, bool consider_framelimit = true);
+ void SetInputSampleRate(unsigned int rate);
void SetVolume(unsigned int lvolume, unsigned int rvolume);
private:
CMixer *m_mixer;