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

Merge pull request #2472 from degasus/master 

AudioCommon: Remove lock on Pause state
This commit is contained in:
Markus Wick 2015-05-30 23:40:46 +02:00
parent ff29ffeb66 9a96e3c416
commit c12f04eefa
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/AudioCommon/AudioCommon.cpp
View File

@ -121,25 +121,6 @@ namespace AudioCommon
return backends; return backends;
} }
void PauseAndLock(bool doLock, bool unpauseOnUnlock)
{
if (g_sound_stream)
{
// audio typically doesn't maintain its own "paused" state
// (that's already handled by the CPU and whatever else being paused)
// so it should be good enough to only lock/unlock here.
CMixer* pMixer = g_sound_stream->GetMixer();
if (pMixer)
{
std::mutex& csMixing = pMixer->MixerCritical();
if (doLock)
csMixing.lock();
else
csMixing.unlock();
}
}
}
void UpdateSoundStream() void UpdateSoundStream()
{ {
if (g_sound_stream) if (g_sound_stream)

1
Source/Core/AudioCommon/AudioCommon.h
View File

@ -17,7 +17,6 @@ namespace AudioCommon
SoundStream* InitSoundStream(); SoundStream* InitSoundStream();
void ShutdownSoundStream(); void ShutdownSoundStream();
std::vector<std::string> GetSoundBackends(); std::vector<std::string> GetSoundBackends();
void PauseAndLock(bool doLock, bool unpauseOnUnlock = true);
void UpdateSoundStream(); void UpdateSoundStream();
void ClearAudioBuffer(bool mute); void ClearAudioBuffer(bool mute);
void SendAIBuffer(short* samples, unsigned int num_samples); void SendAIBuffer(short* samples, unsigned int num_samples);

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

@ -108,8 +108,6 @@ unsigned int CMixer::Mix(short* samples, unsigned int num_samples, bool consider
if (!samples) if (!samples)
return 0; return 0;
std::lock_guard<std::mutex> lk(m_csMixing);
memset(samples, 0, num_samples * 2 * sizeof(short)); memset(samples, 0, num_samples * 2 * sizeof(short));
if (PowerPC::GetState() != PowerPC::CPU_RUNNING) if (PowerPC::GetState() != PowerPC::CPU_RUNNING)

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

@ -108,8 +108,6 @@ public:
} }
} }
std::mutex& MixerCritical() { return m_csMixing; }
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); }
@ -155,7 +153,5 @@ protected:
bool m_log_dtk_audio; bool m_log_dtk_audio;
bool m_log_dsp_audio; bool m_log_dsp_audio;
std::mutex m_csMixing;
std::atomic<float> m_speed; // Current rate of the emulation (1.0 = 100% speed) std::atomic<float> m_speed; // Current rate of the emulation (1.0 = 100% speed)
}; };

1
Source/Core/Core/Core.cpp
View File

@ -690,7 +690,6 @@ bool PauseAndLock(bool doLock, bool unpauseOnUnlock)
ExpansionInterface::PauseAndLock(doLock, unpauseOnUnlock); ExpansionInterface::PauseAndLock(doLock, unpauseOnUnlock);
// audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle). // audio has to come after CPU, because CPU thread can wait for audio thread (m_throttle).
AudioCommon::PauseAndLock(doLock, unpauseOnUnlock);
DSP::GetDSPEmulator()->PauseAndLock(doLock, unpauseOnUnlock); DSP::GetDSPEmulator()->PauseAndLock(doLock, unpauseOnUnlock);
// video has to come after CPU, because CPU thread can wait for video thread (s_efbAccessRequested). // video has to come after CPU, because CPU thread can wait for video thread (s_efbAccessRequested).