mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2026-08-22 10:25:47 -05:00
lint formatting
This commit is contained in:
@@ -768,10 +768,12 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
|
||||
env->GetFieldID(netplay_session_class, "netPlayUICallbacksPointer", "J");
|
||||
s_net_play_client_pointer = env->GetFieldID(netplay_session_class, "netPlayClientPointer", "J");
|
||||
s_net_play_server_pointer = env->GetFieldID(netplay_session_class, "netPlayServerPointer", "J");
|
||||
s_netplay_on_boot_game = env->GetMethodID(netplay_session_class, "onBootGame", "(Ljava/lang/String;J)V");
|
||||
s_netplay_on_boot_game =
|
||||
env->GetMethodID(netplay_session_class, "onBootGame", "(Ljava/lang/String;J)V");
|
||||
s_netplay_on_stop_game = env->GetMethodID(netplay_session_class, "onStopGame", "()V");
|
||||
s_netplay_on_connection_lost = env->GetMethodID(netplay_session_class, "onConnectionLost", "()V");
|
||||
s_netplay_on_connection_error = env->GetMethodID(netplay_session_class, "onConnectionError", "(Ljava/lang/String;)V");
|
||||
s_netplay_on_connection_error =
|
||||
env->GetMethodID(netplay_session_class, "onConnectionError", "(Ljava/lang/String;)V");
|
||||
s_netplay_on_game_changed =
|
||||
env->GetMethodID(netplay_session_class, "onGameChanged", "(Ljava/lang/String;)V");
|
||||
s_netplay_on_host_input_authority_changed =
|
||||
@@ -780,9 +782,11 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
|
||||
env->GetMethodID(netplay_session_class, "onPadBufferChanged", "(I)V");
|
||||
s_netplay_on_chat_message_received =
|
||||
env->GetMethodID(netplay_session_class, "onChatMessageReceived", "(Ljava/lang/String;)V");
|
||||
s_netplay_update = env->GetMethodID(netplay_session_class, "onUpdate", "([Lorg/dolphinemu/dolphinemu/features/netplay/model/Player;)V");
|
||||
s_netplay_on_show_chunked_progress_dialog =
|
||||
env->GetMethodID(netplay_session_class, "onShowChunkedProgressDialog", "(Ljava/lang/String;J[I)V");
|
||||
s_netplay_update =
|
||||
env->GetMethodID(netplay_session_class, "onUpdate",
|
||||
"([Lorg/dolphinemu/dolphinemu/features/netplay/model/Player;)V");
|
||||
s_netplay_on_show_chunked_progress_dialog = env->GetMethodID(
|
||||
netplay_session_class, "onShowChunkedProgressDialog", "(Ljava/lang/String;J[I)V");
|
||||
s_netplay_on_set_chunked_progress =
|
||||
env->GetMethodID(netplay_session_class, "onSetChunkedProgress", "(IJ)V");
|
||||
s_netplay_on_hide_chunked_progress_dialog =
|
||||
@@ -797,15 +801,17 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
|
||||
env->GetMethodID(netplay_session_class, "onSetGameDigestResult", "(ILjava/lang/String;)V");
|
||||
s_netplay_on_abort_game_digest =
|
||||
env->GetMethodID(netplay_session_class, "onAbortGameDigest", "()V");
|
||||
s_netplay_on_traversal_state_changed = env->GetMethodID(
|
||||
netplay_session_class, "onTraversalStateChanged",
|
||||
"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
|
||||
s_netplay_on_traversal_state_changed =
|
||||
env->GetMethodID(netplay_session_class, "onTraversalStateChanged",
|
||||
"(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
|
||||
env->DeleteLocalRef(netplay_session_class);
|
||||
|
||||
const jclass netplay_player_class =
|
||||
env->FindClass("org/dolphinemu/dolphinemu/features/netplay/model/Player");
|
||||
s_netplay_player_class = reinterpret_cast<jclass>(env->NewGlobalRef(netplay_player_class));
|
||||
s_netplay_player_constructor = env->GetMethodID(netplay_player_class, "<init>", "(ILjava/lang/String;Ljava/lang/String;IZLjava/lang/String;)V");
|
||||
s_netplay_player_constructor =
|
||||
env->GetMethodID(netplay_player_class, "<init>",
|
||||
"(ILjava/lang/String;Ljava/lang/String;IZLjava/lang/String;)V");
|
||||
env->DeleteLocalRef(netplay_player_class);
|
||||
|
||||
const jclass analytics_class = env->FindClass("org/dolphinemu/dolphinemu/utils/Analytics");
|
||||
|
||||
@@ -35,7 +35,6 @@
|
||||
|
||||
#include "Core/AchievementManager.h"
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "jni/NetPlay/NetPlayUICallbacks.h"
|
||||
#include "Core/BootManager.h"
|
||||
#include "Core/CommonTitles.h"
|
||||
#include "Core/ConfigLoaders/GameConfigLoader.h"
|
||||
@@ -50,6 +49,7 @@
|
||||
#include "Core/PowerPC/PowerPC.h"
|
||||
#include "Core/State.h"
|
||||
#include "Core/System.h"
|
||||
#include "jni/NetPlay/NetPlayUICallbacks.h"
|
||||
|
||||
#include "DiscIO/Blob.h"
|
||||
#include "DiscIO/Enums.h"
|
||||
@@ -620,13 +620,14 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2ZLjava_la
|
||||
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_RunNetPlay(
|
||||
JNIEnv* env, jclass, jobjectArray jPaths, jboolean jRiivolution, jlong jBootSessionData)
|
||||
{
|
||||
auto boot_session_data = std::unique_ptr<BootSessionData>(
|
||||
reinterpret_cast<BootSessionData*>(jBootSessionData));
|
||||
auto boot_session_data =
|
||||
std::unique_ptr<BootSessionData>(reinterpret_cast<BootSessionData*>(jBootSessionData));
|
||||
if (!boot_session_data)
|
||||
{
|
||||
env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetDisplayToastMsg(),
|
||||
ToJString(env, "Netplay: no boot session data"), JNI_TRUE);
|
||||
env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(), IDCache::GetFinishEmulationActivity());
|
||||
env->CallStaticVoidMethod(IDCache::GetNativeLibraryClass(),
|
||||
IDCache::GetFinishEmulationActivity());
|
||||
return;
|
||||
}
|
||||
Run(env, JStringArrayToVector(env, jPaths), jRiivolution, std::move(*boot_session_data));
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
|
||||
#include <android/log.h>
|
||||
|
||||
#include "UICommon/GameFile.h"
|
||||
#include "UICommon/UICommon.h"
|
||||
#include "NetPlayUICallbacks.h"
|
||||
#include "Common/TraversalClient.h"
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "Core/Core.h"
|
||||
#include "Core/System.h"
|
||||
#include "NetPlayUICallbacks.h"
|
||||
#include "UICommon/GameFile.h"
|
||||
#include "UICommon/UICommon.h"
|
||||
#include "jni/AndroidCommon/AndroidCommon.h"
|
||||
#include "jni/AndroidCommon/IDCache.h"
|
||||
|
||||
@@ -57,7 +57,8 @@ const char* FailureReasonToString(Common::TraversalClient::FailureReason reason)
|
||||
}
|
||||
} // namespace
|
||||
|
||||
namespace NetPlay {
|
||||
namespace NetPlay
|
||||
{
|
||||
|
||||
NetPlayUICallbacks::NetPlayUICallbacks(jobject netplay_session,
|
||||
std::vector<std::shared_ptr<const UICommon::GameFile>> games)
|
||||
@@ -114,7 +115,10 @@ void NetPlayUICallbacks::StopGame()
|
||||
|
||||
// Only used by Qt UI code, never by the C++ core. On Android, hosting state
|
||||
// is tracked in Kotlin (NetplaySession.isHosting).
|
||||
bool NetPlayUICallbacks::IsHosting() const { return false; }
|
||||
bool NetPlayUICallbacks::IsHosting() const
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::Update()
|
||||
{
|
||||
@@ -126,20 +130,20 @@ void NetPlayUICallbacks::Update()
|
||||
|
||||
const std::vector<const NetPlay::Player*> players = client->GetPlayers();
|
||||
|
||||
jobjectArray player_array = env->NewObjectArray(
|
||||
static_cast<jsize>(players.size()), IDCache::GetNetplayPlayerClass(), nullptr);
|
||||
jobjectArray player_array = env->NewObjectArray(static_cast<jsize>(players.size()),
|
||||
IDCache::GetNetplayPlayerClass(), nullptr);
|
||||
|
||||
for (jsize i = 0; i < static_cast<jsize>(players.size()); i++)
|
||||
{
|
||||
const NetPlay::Player* player = players[i];
|
||||
const std::string mapping = NetPlay::GetPlayerMappingString(
|
||||
player->pid, client->GetPadMapping(), client->GetGBAConfig(),
|
||||
client->GetWiimoteMapping());
|
||||
jobject player_obj = env->NewObject(
|
||||
IDCache::GetNetplayPlayerClass(), IDCache::GetNetplayPlayerConstructor(),
|
||||
static_cast<jint>(player->pid), ToJString(env, player->name),
|
||||
ToJString(env, player->revision), static_cast<jint>(player->ping),
|
||||
static_cast<jboolean>(player->IsHost()), ToJString(env, mapping));
|
||||
const std::string mapping =
|
||||
NetPlay::GetPlayerMappingString(player->pid, client->GetPadMapping(),
|
||||
client->GetGBAConfig(), client->GetWiimoteMapping());
|
||||
jobject player_obj =
|
||||
env->NewObject(IDCache::GetNetplayPlayerClass(), IDCache::GetNetplayPlayerConstructor(),
|
||||
static_cast<jint>(player->pid), ToJString(env, player->name),
|
||||
ToJString(env, player->revision), static_cast<jint>(player->ping),
|
||||
static_cast<jboolean>(player->IsHost()), ToJString(env, mapping));
|
||||
env->SetObjectArrayElement(player_array, i, player_obj);
|
||||
env->DeleteLocalRef(player_obj);
|
||||
}
|
||||
@@ -164,12 +168,13 @@ void NetPlayUICallbacks::OnMsgChangeGame(const NetPlay::SyncIdentifier& sync_ide
|
||||
m_current_game_name = netplay_name;
|
||||
|
||||
WithSession([&](JNIEnv* env, jobject session) {
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnGameChanged(),
|
||||
ToJString(env, netplay_name));
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnGameChanged(), ToJString(env, netplay_name));
|
||||
});
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnMsgChangeGBARom(int, const NetPlay::GBAConfig&) {}
|
||||
void NetPlayUICallbacks::OnMsgChangeGBARom(int, const NetPlay::GBAConfig&)
|
||||
{
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnMsgStartGame()
|
||||
{
|
||||
@@ -184,7 +189,9 @@ void NetPlayUICallbacks::OnMsgStartGame()
|
||||
});
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnMsgStopGame() {}
|
||||
void NetPlayUICallbacks::OnMsgStopGame()
|
||||
{
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnMsgPowerButton()
|
||||
{
|
||||
@@ -192,8 +199,12 @@ void NetPlayUICallbacks::OnMsgPowerButton()
|
||||
UICommon::TriggerSTMPowerEvent();
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnPlayerConnect(const std::string&) {}
|
||||
void NetPlayUICallbacks::OnPlayerDisconnect(const std::string&) {}
|
||||
void NetPlayUICallbacks::OnPlayerConnect(const std::string&)
|
||||
{
|
||||
}
|
||||
void NetPlayUICallbacks::OnPlayerDisconnect(const std::string&)
|
||||
{
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnPadBufferChanged(u32 buffer)
|
||||
{
|
||||
@@ -214,8 +225,8 @@ void NetPlayUICallbacks::OnHostInputAuthorityChanged(bool enabled)
|
||||
void NetPlayUICallbacks::OnDesync(u32 frame, const std::string& player)
|
||||
{
|
||||
WithSession([&](JNIEnv* env, jobject session) {
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnDesync(),
|
||||
static_cast<jint>(frame), ToJString(env, player));
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnDesync(), static_cast<jint>(frame),
|
||||
ToJString(env, player));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -229,13 +240,14 @@ void NetPlayUICallbacks::OnConnectionLost()
|
||||
void NetPlayUICallbacks::OnConnectionError(const std::string& message)
|
||||
{
|
||||
WithSession([&](JNIEnv* env, jobject session) {
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnConnectionError(),
|
||||
ToJString(env, message));
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnConnectionError(), ToJString(env, message));
|
||||
});
|
||||
}
|
||||
|
||||
// No-op — all error info is captured by OnTraversalStateChanged which always fires alongside.
|
||||
void NetPlayUICallbacks::OnTraversalError(Common::TraversalClient::FailureReason) {}
|
||||
void NetPlayUICallbacks::OnTraversalError(Common::TraversalClient::FailureReason)
|
||||
{
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnTraversalStateChanged(Common::TraversalClient::State state)
|
||||
{
|
||||
@@ -272,12 +284,25 @@ void NetPlayUICallbacks::OnTraversalStateChanged(Common::TraversalClient::State
|
||||
});
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::OnGameStartAborted() {}
|
||||
void NetPlayUICallbacks::OnGolferChanged(bool, const std::string&) {}
|
||||
void NetPlayUICallbacks::OnTtlDetermined(u8) {}
|
||||
void NetPlayUICallbacks::OnIndexAdded(bool, std::string) {}
|
||||
void NetPlayUICallbacks::OnIndexRefreshFailed(std::string) {}
|
||||
bool NetPlayUICallbacks::IsRecording() { return false; }
|
||||
void NetPlayUICallbacks::OnGameStartAborted()
|
||||
{
|
||||
}
|
||||
void NetPlayUICallbacks::OnGolferChanged(bool, const std::string&)
|
||||
{
|
||||
}
|
||||
void NetPlayUICallbacks::OnTtlDetermined(u8)
|
||||
{
|
||||
}
|
||||
void NetPlayUICallbacks::OnIndexAdded(bool, std::string)
|
||||
{
|
||||
}
|
||||
void NetPlayUICallbacks::OnIndexRefreshFailed(std::string)
|
||||
{
|
||||
}
|
||||
bool NetPlayUICallbacks::IsRecording()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
std::shared_ptr<const UICommon::GameFile>
|
||||
NetPlayUICallbacks::FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
|
||||
@@ -302,7 +327,10 @@ NetPlayUICallbacks::FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
|
||||
return result;
|
||||
}
|
||||
|
||||
std::string NetPlayUICallbacks::FindGBARomPath(const std::array<u8, 20>&, std::string_view, int) { return {}; }
|
||||
std::string NetPlayUICallbacks::FindGBARomPath(const std::array<u8, 20>&, std::string_view, int)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::ShowGameDigestDialog(const std::string& title)
|
||||
{
|
||||
@@ -323,8 +351,8 @@ void NetPlayUICallbacks::SetGameDigestProgress(int pid, int progress)
|
||||
void NetPlayUICallbacks::SetGameDigestResult(int pid, const std::string& result)
|
||||
{
|
||||
WithSession([&](JNIEnv* env, jobject session) {
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnSetGameDigestResult(),
|
||||
static_cast<jint>(pid), ToJString(env, result));
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnSetGameDigestResult(), static_cast<jint>(pid),
|
||||
ToJString(env, result));
|
||||
});
|
||||
}
|
||||
|
||||
@@ -336,7 +364,7 @@ void NetPlayUICallbacks::AbortGameDigest()
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::ShowChunkedProgressDialog(const std::string& title, u64 data_size,
|
||||
std::span<const int> players)
|
||||
std::span<const int> players)
|
||||
{
|
||||
WithSession([&](JNIEnv* env, jobject session) {
|
||||
jintArray j_players = env->NewIntArray(static_cast<jsize>(players.size()));
|
||||
@@ -358,11 +386,13 @@ void NetPlayUICallbacks::HideChunkedProgressDialog()
|
||||
void NetPlayUICallbacks::SetChunkedProgress(int pid, u64 progress)
|
||||
{
|
||||
WithSession([&](JNIEnv* env, jobject session) {
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnSetChunkedProgress(),
|
||||
static_cast<jint>(pid), static_cast<jlong>(progress));
|
||||
env->CallVoidMethod(session, IDCache::GetNetplayOnSetChunkedProgress(), static_cast<jint>(pid),
|
||||
static_cast<jlong>(progress));
|
||||
});
|
||||
}
|
||||
|
||||
void NetPlayUICallbacks::SetHostWiiSyncData(std::vector<u64>, std::string) {}
|
||||
void NetPlayUICallbacks::SetHostWiiSyncData(std::vector<u64>, std::string)
|
||||
{
|
||||
}
|
||||
|
||||
} // namespace NetPlay
|
||||
|
||||
@@ -15,9 +15,11 @@
|
||||
#include "UICommon/GameFile.h"
|
||||
#include "jni/AndroidCommon/IDCache.h"
|
||||
|
||||
namespace NetPlay {
|
||||
namespace NetPlay
|
||||
{
|
||||
|
||||
class NetPlayUICallbacks : public NetPlay::NetPlayUI {
|
||||
class NetPlayUICallbacks : public NetPlay::NetPlayUI
|
||||
{
|
||||
public:
|
||||
NetPlayUICallbacks(jobject netplay_session,
|
||||
std::vector<std::shared_ptr<const UICommon::GameFile>> games);
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
#include "Common/CommonTypes.h"
|
||||
#include "Common/TraversalClient.h"
|
||||
#include "Core/NetPlayCommon.h"
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "Core/Config/NetplaySettings.h"
|
||||
#include "Core/NetPlayClient.h"
|
||||
#include "Core/NetPlayCommon.h"
|
||||
#include "Core/NetPlayServer.h"
|
||||
#include "UICommon/GameFile.h"
|
||||
|
||||
@@ -22,8 +22,8 @@
|
||||
|
||||
static NetPlay::NetPlayUICallbacks* GetUICallbacksPointer(JNIEnv* env, jobject obj)
|
||||
{
|
||||
return reinterpret_cast<NetPlay::NetPlayUICallbacks*>(
|
||||
env->GetLongField(obj, IDCache::GetNetPlayUICallbacksPointer()));
|
||||
return reinterpret_cast<NetPlay::NetPlayUICallbacks*>(
|
||||
env->GetLongField(obj, IDCache::GetNetPlayUICallbacksPointer()));
|
||||
}
|
||||
|
||||
static NetPlay::NetPlayClient* GetClientPointer(JNIEnv* env, jobject obj)
|
||||
@@ -41,8 +41,9 @@ static NetPlay::NetPlayServer* GetServerPointer(JNIEnv* env, jobject obj)
|
||||
extern "C" {
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeSendMessage(JNIEnv* env, jobject obj,
|
||||
jstring jmessage)
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeSendMessage(JNIEnv* env,
|
||||
jobject obj,
|
||||
jstring jmessage)
|
||||
{
|
||||
if (auto* client = GetClientPointer(env, obj))
|
||||
client->SendChatMessage(GetJString(env, jmessage));
|
||||
@@ -50,16 +51,15 @@ Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeSendMessage
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeSetHostInputAuthority(
|
||||
JNIEnv* env, jobject obj, jboolean enable)
|
||||
JNIEnv* env, jobject obj, jboolean enable)
|
||||
{
|
||||
if (auto* server = GetServerPointer(env, obj))
|
||||
server->SetHostInputAuthority(static_cast<bool>(enable));
|
||||
if (auto* server = GetServerPointer(env, obj))
|
||||
server->SetHostInputAuthority(static_cast<bool>(enable));
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeAdjustClientPadBufferSize(JNIEnv* env,
|
||||
jobject obj,
|
||||
jint buffer)
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeAdjustClientPadBufferSize(
|
||||
JNIEnv* env, jobject obj, jint buffer)
|
||||
{
|
||||
if (auto* client = GetClientPointer(env, obj))
|
||||
client->AdjustPadBufferSize(static_cast<u32>(buffer));
|
||||
@@ -118,7 +118,7 @@ Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeJoin(JNIEnv
|
||||
const std::string traversal_choice = Config::Get(Config::NETPLAY_TRAVERSAL_CHOICE);
|
||||
is_traversal = traversal_choice == "traversal";
|
||||
host_ip = is_traversal ? Config::Get(Config::NETPLAY_HOST_CODE) :
|
||||
Config::Get(Config::NETPLAY_ADDRESS);
|
||||
Config::Get(Config::NETPLAY_ADDRESS);
|
||||
host_port = Config::Get(Config::NETPLAY_CONNECT_PORT);
|
||||
}
|
||||
|
||||
@@ -144,19 +144,19 @@ Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeHost(JNIEnv
|
||||
const u16 traversal_port = Config::Get(Config::NETPLAY_TRAVERSAL_PORT);
|
||||
const u16 traversal_port_alt = Config::Get(Config::NETPLAY_TRAVERSAL_PORT_ALT);
|
||||
|
||||
const u16 host_port = is_traversal ? Config::Get(Config::NETPLAY_LISTEN_PORT)
|
||||
: Config::Get(Config::NETPLAY_HOST_PORT);
|
||||
const u16 host_port = is_traversal ? Config::Get(Config::NETPLAY_LISTEN_PORT) :
|
||||
Config::Get(Config::NETPLAY_HOST_PORT);
|
||||
|
||||
auto server = std::make_unique<NetPlay::NetPlayServer>(
|
||||
host_port, use_upnp, ui,
|
||||
NetPlay::NetTraversalConfig{is_traversal, traversal_host, traversal_port, traversal_port_alt});
|
||||
NetPlay::NetTraversalConfig{is_traversal, traversal_host, traversal_port,
|
||||
traversal_port_alt});
|
||||
|
||||
if (!server->is_connected)
|
||||
return 0;
|
||||
|
||||
const std::string network_mode = Config::Get(Config::NETPLAY_NETWORK_MODE);
|
||||
const bool host_input_authority =
|
||||
network_mode == "hostinputauthority" || network_mode == "golf";
|
||||
const bool host_input_authority = network_mode == "hostinputauthority" || network_mode == "golf";
|
||||
server->SetHostInputAuthority(host_input_authority);
|
||||
server->AdjustPadBufferSize(Config::Get(Config::NETPLAY_BUFFER_SIZE));
|
||||
|
||||
@@ -189,7 +189,7 @@ Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeDoAllPlayer
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeStartGame(JNIEnv* env,
|
||||
jobject obj)
|
||||
jobject obj)
|
||||
{
|
||||
auto* server = GetServerPointer(env, obj);
|
||||
if (!server)
|
||||
@@ -198,9 +198,8 @@ Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeStartGame(J
|
||||
server->RequestStartGame();
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeGetPort(JNIEnv* env,
|
||||
jobject obj)
|
||||
JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeGetPort(
|
||||
JNIEnv* env, jobject obj)
|
||||
{
|
||||
if (auto* server = GetServerPointer(env, obj))
|
||||
return static_cast<jint>(server->GetPort());
|
||||
@@ -219,38 +218,36 @@ Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeGetExternal
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReconnectTraversal(JNIEnv*,
|
||||
jobject)
|
||||
jobject)
|
||||
{
|
||||
if (Common::g_TraversalClient)
|
||||
Common::g_TraversalClient->ReconnectToServer();
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReleaseUICallbacks(JNIEnv*,
|
||||
jobject,
|
||||
jlong pointer)
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReleaseUICallbacks(
|
||||
JNIEnv*, jobject, jlong pointer)
|
||||
{
|
||||
delete reinterpret_cast<NetPlay::NetPlayUICallbacks*>(pointer);
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReleaseBootSessionData(JNIEnv*,
|
||||
jobject,
|
||||
jlong pointer)
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReleaseBootSessionData(
|
||||
JNIEnv*, jobject, jlong pointer)
|
||||
{
|
||||
delete reinterpret_cast<BootSessionData*>(pointer);
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReleaseClient(JNIEnv*, jobject,
|
||||
jlong pointer)
|
||||
jlong pointer)
|
||||
{
|
||||
delete reinterpret_cast<NetPlay::NetPlayClient*>(pointer);
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_org_dolphinemu_dolphinemu_features_netplay_NetplaySession_nativeReleaseServer(JNIEnv*, jobject,
|
||||
jlong pointer)
|
||||
jlong pointer)
|
||||
{
|
||||
delete reinterpret_cast<NetPlay::NetPlayServer*>(pointer);
|
||||
}
|
||||
|
||||
@@ -30,9 +30,9 @@
|
||||
#endif
|
||||
|
||||
#include "Common/Config/Config.h"
|
||||
#include "Core/NetPlayCommon.h"
|
||||
#include "Common/Logging/Log.h"
|
||||
#include "Common/TraversalClient.h"
|
||||
#include "Core/NetPlayCommon.h"
|
||||
|
||||
#include "Core/Boot/Boot.h"
|
||||
#include "Core/Config/GraphicsSettings.h"
|
||||
|
||||
Reference in New Issue
Block a user