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

Mixer: Devirtualize DTK and DSP audio logging functions 

Their functionality is already complete in the base class; there's no need to allow overriding.
This commit is contained in:
Lioncash 2015-06-20 21:46:18 -04:00
parent a702c4e01e
commit d81dffd4f0
2 changed files with 62 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,64 @@ void CMixer::SetWiimoteSpeakerVolume(unsigned int lvolume, unsigned int rvolume)
m_wiimote_speaker_mixer.SetVolume(lvolume, rvolume); m_wiimote_speaker_mixer.SetVolume(lvolume, rvolume);
} }
void CMixer::StartLogDTKAudio(const std::string& filename)
{
if (!m_log_dtk_audio)
{
m_log_dtk_audio = true;
g_wave_writer_dtk.Start(filename, 48000);
g_wave_writer_dtk.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting DTK Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DTK Audio logging has already been started");
}
}
void CMixer::StopLogDTKAudio()
{
if (m_log_dtk_audio)
{
m_log_dtk_audio = false;
g_wave_writer_dtk.Stop();
NOTICE_LOG(DSPHLE, "Stopping DTK Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DTK Audio logging has already been stopped");
}
}
void CMixer::StartLogDSPAudio(const std::string& filename)
{
if (!m_log_dsp_audio)
{
m_log_dsp_audio = true;
g_wave_writer_dsp.Start(filename, 32000);
g_wave_writer_dsp.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting DSP Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DSP Audio logging has already been started");
}
}
void CMixer::StopLogDSPAudio()
{
if (m_log_dsp_audio)
{
m_log_dsp_audio = false;
g_wave_writer_dsp.Stop();
NOTICE_LOG(DSPHLE, "Stopping DSP Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DSP Audio logging has already been stopped");
}
}
void CMixer::MixerFifo::SetInputSampleRate(unsigned int rate) void CMixer::MixerFifo::SetInputSampleRate(unsigned int rate)
{ {
m_input_sample_rate = rate; m_input_sample_rate = rate;

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

@ -50,63 +50,11 @@ public:
void SetStreamingVolume(unsigned int lvolume, unsigned int rvolume); void SetStreamingVolume(unsigned int lvolume, unsigned int rvolume);
void SetWiimoteSpeakerVolume(unsigned int lvolume, unsigned int rvolume); void SetWiimoteSpeakerVolume(unsigned int lvolume, unsigned int rvolume);
virtual void StartLogDTKAudio(const std::string& filename) void StartLogDTKAudio(const std::string& filename);
{ void StopLogDTKAudio();
if (!m_log_dtk_audio)
{
m_log_dtk_audio = true;
g_wave_writer_dtk.Start(filename, 48000);
g_wave_writer_dtk.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting DTK Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DTK Audio logging has already been started");
}
}
virtual void StopLogDTKAudio() void StartLogDSPAudio(const std::string& filename);
{ void StopLogDSPAudio();
if (m_log_dtk_audio)
{
m_log_dtk_audio = false;
g_wave_writer_dtk.Stop();
NOTICE_LOG(DSPHLE, "Stopping DTK Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DTK Audio logging has already been stopped");
}
}
virtual void StartLogDSPAudio(const std::string& filename)
{
if (!m_log_dsp_audio)
{
m_log_dsp_audio = true;
g_wave_writer_dsp.Start(filename, 32000);
g_wave_writer_dsp.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting DSP Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DSP Audio logging has already been started");
}
}
virtual void StopLogDSPAudio()
{
if (m_log_dsp_audio)
{
m_log_dsp_audio = false;
g_wave_writer_dsp.Stop();
NOTICE_LOG(DSPHLE, "Stopping DSP Audio logging");
}
else
{
WARN_LOG(DSPHLE, "DSP Audio logging has already been stopped");
}
}
float GetCurrentSpeed() const { return m_speed.load(); } float GetCurrentSpeed() const { return m_speed.load(); }
void UpdateSpeed(float val) { m_speed.store(val); } void UpdateSpeed(float val) { m_speed.store(val); }