mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-03 16:16:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

up to a412e4c from ishii

Browse source
This commit is contained in:
r2dliu 2020-07-17 15:45:10 -04:00
commit 5301d53b08
5 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/AudioCommon/CubebStream.cpp
View file

@ -11,8 +11,8 @@
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
// ~10 ms - needs to be at least 240 for surround // SSBM outputs samples in 5 ms batches - ensures we always have at least one extra batch buffered
constexpr u32 BUFFER_SAMPLES = 512; constexpr u32 BUFFER_SAMPLES = 480;
long CubebStream::DataCallback(cubeb_stream* stream, void* user_data, const void* /*input_buffer*/, long CubebStream::DataCallback(cubeb_stream* stream, void* user_data, const void* /*input_buffer*/,
void* output_buffer, long num_frames) void* output_buffer, long num_frames)

1
Source/Core/Common/CommonPaths.h
View file

@ -26,6 +26,7 @@
#else #else
#define USERDATA_DIR "user" #define USERDATA_DIR "user"
#define DOLPHIN_DATA_DIR "SlippiOnline" #define DOLPHIN_DATA_DIR "SlippiOnline"
#define PLAYBACK_DATA_DIR "SlippiPlayback"
#endif #endif
// Dirs in both User and Sys // Dirs in both User and Sys

2
Source/Core/Common/Version.cpp
View file

@ -18,7 +18,7 @@ namespace Common
#define BUILD_TYPE_STR "" #define BUILD_TYPE_STR ""
#endif #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; const std::string scm_slippi_semver_str = SLIPPI_REV_STR;

2
Source/Core/Core/Slippi/SlippiNetplay.cpp
View file

@ -232,7 +232,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet)
case NetPlay::NP_MSG_SLIPPI_MATCH_SELECTIONS: case NetPlay::NP_MSG_SLIPPI_MATCH_SELECTIONS:
{ {
auto s = readSelectionsFromPacket(packet); 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); matchInfo.remotePlayerSelections.Merge(*s);
// Set player name is not empty // Set player name is not empty

4
Source/Core/DolphinQt/AboutDialog.cpp
View file

@ -47,12 +47,12 @@ AboutDialog::AboutDialog(QWidget* parent) : QDialog(parent)
<a href='https://forums.dolphin-emu.org/'>%SUPPORT%</a> <a href='https://forums.dolphin-emu.org/'>%SUPPORT%</a>
)") )")
.replace(QStringLiteral("%VERSION_STRING%"), .replace(QStringLiteral("%VERSION_STRING%"),
QString::fromUtf8(Common::scm_desc_str.c_str())) QString::fromUtf8(Common::scm_slippi_semver_str.c_str()))
.replace(QStringLiteral("%BRANCH%"), .replace(QStringLiteral("%BRANCH%"),
// i18n: "Branch" means the version control term, not a literal tree 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()))) tr("Branch: %1").arg(QString::fromUtf8(Common::scm_branch_str.c_str())))
.replace(QStringLiteral("%REVISION%"), .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%"), .replace(QStringLiteral("%QT_VERSION%"),
tr("Using Qt %1").arg(QStringLiteral(QT_VERSION_STR))) tr("Using Qt %1").arg(QStringLiteral(QT_VERSION_STR)))
.replace(QStringLiteral("%CHECK_FOR_UPDATES%"), tr("Check for updates")) .replace(QStringLiteral("%CHECK_FOR_UPDATES%"), tr("Check for updates"))