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

Rename CMixer to Mixer

Browse Source
This commit is contained in:
Michael Maltese
2017-06-26 14:41:12 -07:00
parent aa020040f6
commit b2c9d6d217
9 changed files with 42 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,11 +11,11 @@
#include "AudioCommon/WaveFile.h"
#include "Common/CommonTypes.h"
class CMixer final
class Mixer final
{
public:
explicit CMixer(unsigned int BackendSampleRate);
~CMixer();
explicit Mixer(unsigned int BackendSampleRate);
~Mixer();
// Called from audio threads
unsigned int Mix(short* samples, unsigned int numSamples);
@ -50,8 +50,7 @@ private:
class MixerFifo final
{
public:
MixerFifo(CMixer* mixer, unsigned sample_rate)
: m_mixer(mixer), m_input_sample_rate(sample_rate)
MixerFifo(Mixer* mixer, unsigned sample_rate) : m_mixer(mixer), m_input_sample_rate(sample_rate)
{
}
void PushSamples(const short* samples, unsigned int num_samples);
@ -62,7 +61,7 @@ private:
unsigned int AvailableSamples() const;
private:
CMixer* m_mixer;
Mixer* m_mixer;
unsigned m_input_sample_rate;
std::array<short, MAX_SAMPLES * 2> m_buffer{};
std::atomic<u32> m_indexW{0};