ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mixer: Fix erroneous global prefixes on class variables

This commit is contained in:
Lioncash 2015-06-20 21:48:50 -04:00
parent d81dffd4f0
commit 9dd607b923
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -155,14 +155,14 @@ void CMixer::PushSamples(const short *samples, unsigned int num_samples)
{ {
m_dma_mixer.PushSamples(samples, num_samples); m_dma_mixer.PushSamples(samples, num_samples);
if (m_log_dsp_audio) if (m_log_dsp_audio)
g_wave_writer_dsp.AddStereoSamplesBE(samples, num_samples); m_wave_writer_dsp.AddStereoSamplesBE(samples, num_samples);
} }
void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples) void CMixer::PushStreamingSamples(const short *samples, unsigned int num_samples)
{ {
m_streaming_mixer.PushSamples(samples, num_samples); m_streaming_mixer.PushSamples(samples, num_samples);
if (m_log_dtk_audio) if (m_log_dtk_audio)
g_wave_writer_dtk.AddStereoSamplesBE(samples, num_samples); m_wave_writer_dtk.AddStereoSamplesBE(samples, num_samples);
} }
void CMixer::PushWiimoteSpeakerSamples(const short *samples, unsigned int num_samples, unsigned int sample_rate) void CMixer::PushWiimoteSpeakerSamples(const short *samples, unsigned int num_samples, unsigned int sample_rate)
@ -208,8 +208,8 @@ void CMixer::StartLogDTKAudio(const std::string& filename)
if (!m_log_dtk_audio) if (!m_log_dtk_audio)
{ {
m_log_dtk_audio = true; m_log_dtk_audio = true;
g_wave_writer_dtk.Start(filename, 48000); m_wave_writer_dtk.Start(filename, 48000);
g_wave_writer_dtk.SetSkipSilence(false); m_wave_writer_dtk.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting DTK Audio logging"); NOTICE_LOG(DSPHLE, "Starting DTK Audio logging");
} }
else else
@ -223,7 +223,7 @@ void CMixer::StopLogDTKAudio()
if (m_log_dtk_audio) if (m_log_dtk_audio)
{ {
m_log_dtk_audio = false; m_log_dtk_audio = false;
g_wave_writer_dtk.Stop(); m_wave_writer_dtk.Stop();
NOTICE_LOG(DSPHLE, "Stopping DTK Audio logging"); NOTICE_LOG(DSPHLE, "Stopping DTK Audio logging");
} }
else else
@ -237,8 +237,8 @@ void CMixer::StartLogDSPAudio(const std::string& filename)
if (!m_log_dsp_audio) if (!m_log_dsp_audio)
{ {
m_log_dsp_audio = true; m_log_dsp_audio = true;
g_wave_writer_dsp.Start(filename, 32000); m_wave_writer_dsp.Start(filename, 32000);
g_wave_writer_dsp.SetSkipSilence(false); m_wave_writer_dsp.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting DSP Audio logging"); NOTICE_LOG(DSPHLE, "Starting DSP Audio logging");
} }
else else
@ -252,7 +252,7 @@ void CMixer::StopLogDSPAudio()
if (m_log_dsp_audio) if (m_log_dsp_audio)
{ {
m_log_dsp_audio = false; m_log_dsp_audio = false;
g_wave_writer_dsp.Stop(); m_wave_writer_dsp.Stop();
NOTICE_LOG(DSPHLE, "Stopping DSP Audio logging"); NOTICE_LOG(DSPHLE, "Stopping DSP Audio logging");
} }
else else

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

@ -95,8 +95,8 @@ protected:
MixerFifo m_wiimote_speaker_mixer; MixerFifo m_wiimote_speaker_mixer;
unsigned int m_sampleRate; unsigned int m_sampleRate;
WaveFileWriter g_wave_writer_dtk; WaveFileWriter m_wave_writer_dtk;
WaveFileWriter g_wave_writer_dsp; WaveFileWriter m_wave_writer_dsp;
bool m_log_dtk_audio; bool m_log_dtk_audio;
bool m_log_dsp_audio; bool m_log_dsp_audio;