mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4665 from FearlessTobi/port-yuzu-stuffz

Browse source 
Port various minor PRs from yuzu
This commit is contained in:
Weiyi Wang 2019-03-04 12:36:10 -05:00 committed by GitHub
commit b3261472fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/audio_core/codec.cpp
View file

@ -72,8 +72,8 @@ StereoBuffer16 DecodeADPCM(const u8* const data, const std::size_t sample_count,
} }
} }
state.yn1 = yn1; state.yn1 = static_cast<s16>(yn1);
state.yn2 = yn2; state.yn2 = static_cast<s16>(yn2);
return ret; return ret;
} }

2
src/citra_qt/compatdb.cpp
View file

@ -59,7 +59,7 @@ void CompatDB::Submit() {
button(QWizard::CancelButton)->setVisible(false); button(QWizard::CancelButton)->setVisible(false);
testcase_watcher.setFuture(QtConcurrent::run( testcase_watcher.setFuture(QtConcurrent::run(
[this]() { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); })); [] { return Core::System::GetInstance().TelemetrySession().SubmitTestcase(); }));
break; break;
default: default:
LOG_ERROR(Frontend, "Unexpected page: {}", currentId()); LOG_ERROR(Frontend, "Unexpected page: {}", currentId());

2
src/core/frontend/emu_window.cpp
View file

@ -75,7 +75,7 @@ static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigne
} }
} }
std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) { std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) const {
if (Settings::values.toggle_3d) { if (Settings::values.toggle_3d) {
if (new_x >= framebuffer_layout.width / 2) if (new_x >= framebuffer_layout.width / 2)
new_x -= framebuffer_layout.width / 2; new_x -= framebuffer_layout.width / 2;

2
src/core/frontend/emu_window.h
View file

@ -164,5 +164,5 @@ private:
/** /**
* Clip the provided coordinates to be inside the touchscreen area. * Clip the provided coordinates to be inside the touchscreen area.
*/ */
std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y); std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y) const;
}; };