From 5301d53b0836b3c8c641660fd920ebc454e4141a Mon Sep 17 00:00:00 2001 From: r2dliu Date: Fri, 17 Jul 2020 15:45:10 -0400 Subject: [PATCH] up to a412e4c from ishii --- Source/Core/AudioCommon/CubebStream.cpp | 4 ++-- Source/Core/Common/CommonPaths.h | 1 + Source/Core/Common/Version.cpp | 2 +- Source/Core/Core/Slippi/SlippiNetplay.cpp | 2 +- Source/Core/DolphinQt/AboutDialog.cpp | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Source/Core/AudioCommon/CubebStream.cpp b/Source/Core/AudioCommon/CubebStream.cpp index 5c3100c52c..82abcfb5a8 100644 --- a/Source/Core/AudioCommon/CubebStream.cpp +++ b/Source/Core/AudioCommon/CubebStream.cpp @@ -11,8 +11,8 @@ #include "Common/Thread.h" #include "Core/ConfigManager.h" -// ~10 ms - needs to be at least 240 for surround -constexpr u32 BUFFER_SAMPLES = 512; +// SSBM outputs samples in 5 ms batches - ensures we always have at least one extra batch buffered +constexpr u32 BUFFER_SAMPLES = 480; long CubebStream::DataCallback(cubeb_stream* stream, void* user_data, const void* /*input_buffer*/, void* output_buffer, long num_frames) diff --git a/Source/Core/Common/CommonPaths.h b/Source/Core/Common/CommonPaths.h index c3cd13d00b..8a6931e0f2 100644 --- a/Source/Core/Common/CommonPaths.h +++ b/Source/Core/Common/CommonPaths.h @@ -26,6 +26,7 @@ #else #define USERDATA_DIR "user" #define DOLPHIN_DATA_DIR "SlippiOnline" +#define PLAYBACK_DATA_DIR "SlippiPlayback" #endif // Dirs in both User and Sys diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp index eb8cb7e28a..24fa695104 100644 --- a/Source/Core/Common/Version.cpp +++ b/Source/Core/Common/Version.cpp @@ -18,7 +18,7 @@ namespace Common #define BUILD_TYPE_STR "" #endif -#define SLIPPI_REV_STR "2.1.1" +#define SLIPPI_REV_STR "2.2.0" const std::string scm_slippi_semver_str = SLIPPI_REV_STR; diff --git a/Source/Core/Core/Slippi/SlippiNetplay.cpp b/Source/Core/Core/Slippi/SlippiNetplay.cpp index 88a568fb37..c7f7f49a17 100644 --- a/Source/Core/Core/Slippi/SlippiNetplay.cpp +++ b/Source/Core/Core/Slippi/SlippiNetplay.cpp @@ -232,7 +232,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet) case NetPlay::NP_MSG_SLIPPI_MATCH_SELECTIONS: { auto s = readSelectionsFromPacket(packet); - ERROR_LOG(SLIPPI_ONLINE, "[Received Selections] Char: 0x%X, Color: 0x%X", s->characterId, s->characterId); + INFO_LOG(SLIPPI_ONLINE, "[Netplay] Received selections from opponent"); matchInfo.remotePlayerSelections.Merge(*s); // Set player name is not empty diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp index c092c618e1..877bde9ccb 100644 --- a/Source/Core/DolphinQt/AboutDialog.cpp +++ b/Source/Core/DolphinQt/AboutDialog.cpp @@ -47,12 +47,12 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent) %SUPPORT% )") .replace(QStringLiteral("%VERSION_STRING%"), - QString::fromUtf8(Common::scm_desc_str.c_str())) + QString::fromUtf8(Common::scm_slippi_semver_str.c_str())) .replace(QStringLiteral("%BRANCH%"), // i18n: "Branch" means the version control term, not a literal tree branch. tr("Branch: %1").arg(QString::fromUtf8(Common::scm_branch_str.c_str()))) .replace(QStringLiteral("%REVISION%"), - tr("Revision: %1").arg(QString::fromUtf8(Common::scm_rev_git_str.c_str()))) + tr("Revision: %1").arg(QString::fromUtf8(""))) .replace(QStringLiteral("%QT_VERSION%"), tr("Using Qt %1").arg(QStringLiteral(QT_VERSION_STR))) .replace(QStringLiteral("%CHECK_FOR_UPDATES%"), tr("Check for updates"))