prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/yuzu-emu/yuzu

Browse Source
This commit is contained in:
Jarek Syrylak
2018-06-26 10:10:05 +01:00
parent 5c5950bd9e 1da0ee57fd
commit f684b02719
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/hle/service/audio/audren_u.cpp
View File

@@ -150,7 +150,7 @@ private:
UpdateDataHeader() {}
UpdateDataHeader(const AudioRendererParameter& config) {
revision = config.revision;
revision = Common::MakeMagic('R', 'E', 'V', '4'); // 5.1.0 Revision
behavior_size = 0xb0;
memory_pools_size = (config.effect_count + (config.voice_count * 4)) * 0x10;
voices_size = config.voice_count * 0x10;

6
src/video_core/debug_utils/debug_utils.h
View File

@@ -55,8 +55,10 @@ public:
virtual ~BreakPointObserver() {
auto context = context_weak.lock();
if (context) {
std::unique_lock<std::mutex> lock(context->breakpoint_mutex);
context->breakpoint_observers.remove(this);
{
std::unique_lock<std::mutex> lock(context->breakpoint_mutex);
context->breakpoint_observers.remove(this);
}
// If we are the last observer to be destroyed, tell the debugger context that
// it is free to continue. In particular, this is required for a proper yuzu