citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4582 from FearlessTobi/port-2020 

Port two minor changes from yuzu (# 1848 and # 2020)
This commit is contained in:
bunnei 2019-01-21 15:54:41 -05:00 committed by GitHub
parent 95a57a2fe3 5df6506e81
commit 7903ad9aa3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/audio_core/time_stretch.cpp
View File

@ -54,8 +54,8 @@ std::size_t TimeStretcher::Process(const s16* in, std::size_t num_in, s16* out,
const double lpf_gain = 1.0 - std::exp(-time_delta / lpf_time_scale); const double lpf_gain = 1.0 - std::exp(-time_delta / lpf_time_scale);
stretch_ratio += lpf_gain * (current_ratio - stretch_ratio); stretch_ratio += lpf_gain * (current_ratio - stretch_ratio);
// Place a lower limit of 5% speed. When a game boots up, there will be // Place a lower limit of 5% speed. When a game boots up, there will be
// many silence samples. These do not need to be timestretched. // many silence samples. These do not need to be timestretched.
stretch_ratio = std::max(stretch_ratio, 0.05); stretch_ratio = std::max(stretch_ratio, 0.05);
sound_touch->setTempo(stretch_ratio); sound_touch->setTempo(stretch_ratio);

4
src/citra_qt/game_list.cpp
View File

@ -585,7 +585,7 @@ void GameList::LoadCompatibilityList() {
QJsonDocument json = QJsonDocument::fromJson(string_content.toUtf8()); QJsonDocument json = QJsonDocument::fromJson(string_content.toUtf8());
QJsonArray arr = json.array(); QJsonArray arr = json.array();
for (const QJsonValueRef& value : arr) { for (const QJsonValueRef value : arr) {
QJsonObject game = value.toObject(); QJsonObject game = value.toObject();
if (game.contains("compatibility") && game["compatibility"].isDouble()) { if (game.contains("compatibility") && game["compatibility"].isDouble()) {
@ -593,7 +593,7 @@ void GameList::LoadCompatibilityList() {
QString directory = game["directory"].toString(); QString directory = game["directory"].toString();
QJsonArray ids = game["releases"].toArray(); QJsonArray ids = game["releases"].toArray();
for (const QJsonValueRef& id_ref : ids) { for (const QJsonValueRef id_ref : ids) {
QJsonObject id_object = id_ref.toObject(); QJsonObject id_object = id_ref.toObject();
QString id = id_object["id"].toString(); QString id = id_object["id"].toString();
compatibility_list.emplace( compatibility_list.emplace(