From d23542b67dbe9218a6849dd699314a3eeeff5217 Mon Sep 17 00:00:00 2001 From: jmlee337 Date: Sun, 2 Jun 2024 18:20:45 +0900 Subject: [PATCH 1/5] add `-p` `--slippi-port` cmd line option fixes #419 --- Source/Core/DolphinWX/Main.cpp | 5 +++++ Source/Core/DolphinWX/Main.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 7740ba4f06..532d532fe2 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -141,6 +141,8 @@ bool DolphinApp::OnInit() if (m_select_video_backend && !m_video_backend_name.empty()) SConfig::GetInstance().m_strVideoBackend = WxStrToStr(m_video_backend_name); + if (m_select_slippi_port && m_slippi_port > 0 && m_slippi_port < 65536) + SConfig::GetInstance().m_spectator_local_port = m_slippi_port; #ifdef IS_PLAYBACK // Fallback to a default config file path if the user fails to provide one @@ -320,6 +322,8 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser &parser) wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, {wxCMD_LINE_OPTION, "a", "audio_emulation", "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, + {wxCMD_LINE_OPTION, "p", "slippi-port", "Port to use for the Slippi spectate server (default: 51441)", + wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL}, #ifdef IS_PLAYBACK {wxCMD_LINE_OPTION, "i", "slippi-input", "Path to Slippi replay config file (default: Slippi/playback.txt)", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, @@ -389,6 +393,7 @@ bool DolphinApp::OnCmdLineParsed(wxCmdLineParser &parser) m_confirm_stop = parser.Found("confirm", &m_confirm_setting); m_select_video_backend = parser.Found("video_backend", &m_video_backend_name); m_select_audio_emulation = parser.Found("audio_emulation", &m_audio_emulation_name); + m_select_slippi_port = parser.Found("slippi-port", &m_slippi_port); #ifdef IS_PLAYBACK m_select_slippi_input = parser.Found("slippi-input", &m_slippi_input_name); m_hide_seekbar = parser.Found("hide-seekbar"); diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index 4611c54968..8a2b2e6ec3 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -49,6 +49,7 @@ class DolphinApp : public wxApp bool m_show_version = false; bool m_select_video_backend = false; bool m_select_slippi_input = false; + bool m_select_slippi_port = false; bool m_select_output_directory = false; bool m_select_output_filename_base = false; bool m_select_audio_emulation = false; @@ -59,6 +60,7 @@ class DolphinApp : public wxApp wxString m_video_backend_name; wxString m_audio_emulation_name; wxString m_slippi_input_name; + long m_slippi_port; wxString m_output_directory; wxString m_output_filename_base; wxString m_user_path; From 5eceb717109a15fe9f5ec2b2bf190fbb095b636f Mon Sep 17 00:00:00 2001 From: jmlee337 Date: Mon, 3 Jun 2024 12:45:09 +0900 Subject: [PATCH 2/5] slippi port >= 1024 --- Source/Core/DolphinWX/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 532d532fe2..b3e6da1f3f 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -141,7 +141,7 @@ bool DolphinApp::OnInit() if (m_select_video_backend && !m_video_backend_name.empty()) SConfig::GetInstance().m_strVideoBackend = WxStrToStr(m_video_backend_name); - if (m_select_slippi_port && m_slippi_port > 0 && m_slippi_port < 65536) + if (m_select_slippi_port && m_slippi_port >= 1024 && m_slippi_port < 65536) SConfig::GetInstance().m_spectator_local_port = m_slippi_port; #ifdef IS_PLAYBACK From eae8af3f5754054522765db32dae4c7f00cfcc69 Mon Sep 17 00:00:00 2001 From: jmlee337 Date: Mon, 3 Jun 2024 13:01:14 +0900 Subject: [PATCH 3/5] slippi port flag doc valid port range --- Source/Core/DolphinWX/Main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index b3e6da1f3f..5fbe5919b7 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -322,7 +322,7 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser &parser) wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, {wxCMD_LINE_OPTION, "a", "audio_emulation", "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, - {wxCMD_LINE_OPTION, "p", "slippi-port", "Port to use for the Slippi spectate server (default: 51441)", + {wxCMD_LINE_OPTION, "p", "slippi-port", "Port to use for the Slippi spectate server (1024 - 65535, default: 51441)", wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL}, #ifdef IS_PLAYBACK {wxCMD_LINE_OPTION, "i", "slippi-input", "Path to Slippi replay config file (default: Slippi/playback.txt)", From 87b5fdafdab17d7e6f12dc1f86976b85f40b8dc9 Mon Sep 17 00:00:00 2001 From: jmlee337 Date: Tue, 4 Jun 2024 21:37:43 +0900 Subject: [PATCH 4/5] slippi port -> slippi spectate port --- Source/Core/DolphinWX/Main.cpp | 8 ++++---- Source/Core/DolphinWX/Main.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 5fbe5919b7..bcf5a76d5c 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -141,8 +141,8 @@ bool DolphinApp::OnInit() if (m_select_video_backend && !m_video_backend_name.empty()) SConfig::GetInstance().m_strVideoBackend = WxStrToStr(m_video_backend_name); - if (m_select_slippi_port && m_slippi_port >= 1024 && m_slippi_port < 65536) - SConfig::GetInstance().m_spectator_local_port = m_slippi_port; + if (m_select_slippi_spectate_port && m_slippi_spectate_port >= 1024 && m_slippi_spectate_port < 65536) + SConfig::GetInstance().m_spectator_local_port = m_slippi_spectate_port; #ifdef IS_PLAYBACK // Fallback to a default config file path if the user fails to provide one @@ -322,7 +322,7 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser &parser) wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, {wxCMD_LINE_OPTION, "a", "audio_emulation", "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, - {wxCMD_LINE_OPTION, "p", "slippi-port", "Port to use for the Slippi spectate server (1024 - 65535, default: 51441)", + {wxCMD_LINE_OPTION, nullptr, "slippi-spectate-port", "Port to use for the Slippi spectate server (1024 - 65535, default: 51441)", wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL}, #ifdef IS_PLAYBACK {wxCMD_LINE_OPTION, "i", "slippi-input", "Path to Slippi replay config file (default: Slippi/playback.txt)", @@ -393,7 +393,7 @@ bool DolphinApp::OnCmdLineParsed(wxCmdLineParser &parser) m_confirm_stop = parser.Found("confirm", &m_confirm_setting); m_select_video_backend = parser.Found("video_backend", &m_video_backend_name); m_select_audio_emulation = parser.Found("audio_emulation", &m_audio_emulation_name); - m_select_slippi_port = parser.Found("slippi-port", &m_slippi_port); + m_select_slippi_spectate_port = parser.Found("slippi-spectate-port", &m_slippi_spectate_port); #ifdef IS_PLAYBACK m_select_slippi_input = parser.Found("slippi-input", &m_slippi_input_name); m_hide_seekbar = parser.Found("hide-seekbar"); diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index 8a2b2e6ec3..c3e1a6f527 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -49,7 +49,7 @@ class DolphinApp : public wxApp bool m_show_version = false; bool m_select_video_backend = false; bool m_select_slippi_input = false; - bool m_select_slippi_port = false; + bool m_select_slippi_spectate_port = false; bool m_select_output_directory = false; bool m_select_output_filename_base = false; bool m_select_audio_emulation = false; @@ -60,7 +60,7 @@ class DolphinApp : public wxApp wxString m_video_backend_name; wxString m_audio_emulation_name; wxString m_slippi_input_name; - long m_slippi_port; + long m_slippi_spectate_port; wxString m_output_directory; wxString m_output_filename_base; wxString m_user_path; From 819b6d9b8323526d2f0ff55288627e6d8b044060 Mon Sep 17 00:00:00 2001 From: jmlee337 Date: Wed, 5 Jun 2024 11:05:47 +0900 Subject: [PATCH 5/5] slippi spectate port -> slippi spectator port --- Source/Core/DolphinWX/Main.cpp | 8 ++++---- Source/Core/DolphinWX/Main.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index bcf5a76d5c..c266fb9cc5 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -141,8 +141,8 @@ bool DolphinApp::OnInit() if (m_select_video_backend && !m_video_backend_name.empty()) SConfig::GetInstance().m_strVideoBackend = WxStrToStr(m_video_backend_name); - if (m_select_slippi_spectate_port && m_slippi_spectate_port >= 1024 && m_slippi_spectate_port < 65536) - SConfig::GetInstance().m_spectator_local_port = m_slippi_spectate_port; + if (m_select_slippi_spectator_port && m_slippi_spectator_port >= 1024 && m_slippi_spectator_port < 65536) + SConfig::GetInstance().m_spectator_local_port = m_slippi_spectator_port; #ifdef IS_PLAYBACK // Fallback to a default config file path if the user fails to provide one @@ -322,7 +322,7 @@ void DolphinApp::OnInitCmdLine(wxCmdLineParser &parser) wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, {wxCMD_LINE_OPTION, "a", "audio_emulation", "Low level (LLE) or high level (HLE) audio", wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL}, - {wxCMD_LINE_OPTION, nullptr, "slippi-spectate-port", "Port to use for the Slippi spectate server (1024 - 65535, default: 51441)", + {wxCMD_LINE_OPTION, nullptr, "slippi-spectator-port", "Port to use for the Slippi spectate server (1024 - 65535, default: 51441)", wxCMD_LINE_VAL_NUMBER, wxCMD_LINE_PARAM_OPTIONAL}, #ifdef IS_PLAYBACK {wxCMD_LINE_OPTION, "i", "slippi-input", "Path to Slippi replay config file (default: Slippi/playback.txt)", @@ -393,7 +393,7 @@ bool DolphinApp::OnCmdLineParsed(wxCmdLineParser &parser) m_confirm_stop = parser.Found("confirm", &m_confirm_setting); m_select_video_backend = parser.Found("video_backend", &m_video_backend_name); m_select_audio_emulation = parser.Found("audio_emulation", &m_audio_emulation_name); - m_select_slippi_spectate_port = parser.Found("slippi-spectate-port", &m_slippi_spectate_port); + m_select_slippi_spectator_port = parser.Found("slippi-spectator-port", &m_slippi_spectator_port); #ifdef IS_PLAYBACK m_select_slippi_input = parser.Found("slippi-input", &m_slippi_input_name); m_hide_seekbar = parser.Found("hide-seekbar"); diff --git a/Source/Core/DolphinWX/Main.h b/Source/Core/DolphinWX/Main.h index c3e1a6f527..99fbabbbc7 100644 --- a/Source/Core/DolphinWX/Main.h +++ b/Source/Core/DolphinWX/Main.h @@ -49,7 +49,7 @@ class DolphinApp : public wxApp bool m_show_version = false; bool m_select_video_backend = false; bool m_select_slippi_input = false; - bool m_select_slippi_spectate_port = false; + bool m_select_slippi_spectator_port = false; bool m_select_output_directory = false; bool m_select_output_filename_base = false; bool m_select_audio_emulation = false; @@ -60,7 +60,7 @@ class DolphinApp : public wxApp wxString m_video_backend_name; wxString m_audio_emulation_name; wxString m_slippi_input_name; - long m_slippi_spectate_port; + long m_slippi_spectator_port; wxString m_output_directory; wxString m_output_filename_base; wxString m_user_path;