resolve review

only 2 months late :sanic:
HookedBehemoth · Aug 23, 2023 · 650a857 · 650a857
1 parent ecd6627
commit 650a857
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 34 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -8,9 +8,7 @@
                 "${DEVKITPRO}/libnx/include/",
                 "${DEVKITPRO}/portlibs/switch/include/",
                 "${workspaceFolder}/sys-tune/nxExt/include/",
-                "${workspaceFolder}/sys-tune/source/",
                 "${workspaceFolder}/overlay/lib/include/",
-                "${workspaceFolder}/overlay/source/",
                 "${workspaceFolder}/ipc/",
                 "${workspaceFolder}/common/"
             ],

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 export GITHASH 		:= $(shell git rev-parse --short HEAD)
 export VERSION 		:= 2.0.0
-export API_VERSION 	:= 3
+export API_VERSION 	:= 4
 export WANT_FLAC 	:= 1
 export WANT_MP3 	:= 1
 export WANT_WAV 	:= 1
@@ -11,8 +11,8 @@ clean:
 	$(MAKE) -C sys-tune/nxExt clean
 	$(MAKE) -C overlay clean
 	$(MAKE) -C sys-tune clean
-	rm -rf dist
-	rm -f sys-tune-*-*.zip
+	-rm -r dist
+	-rm sys-tune-*-*.zip
 
 overlay:
 	$(MAKE) -C overlay
@@ -30,6 +30,6 @@ dist: all
 	cp overlay/sys-tune-overlay.ovl dist/switch/.overlays/
 	cp sys-tune/toolbox.json dist/atmosphere/contents/4200000000000000/
 	cd dist; zip -r sys-tune-$(VERSION)-$(GITHASH).zip ./**/; cd ../;
-	hactool -t nso sys-tune/sys-tune.nso
+	-hactool -t nso sys-tune/sys-tune.nso
 
 .PHONY: all overlay module
diff --git a/common/config/config.cpp b/common/config/config.cpp
@@ -29,7 +29,7 @@ auto get_tid_str(u64 tid) -> const char* {
     return buf;
 }
 
-} // namespace
+}
 
 auto get_shuffle() -> bool {
     return ini_getbool("config", "shuffle", false, CONFIG_PATH);
@@ -111,4 +111,4 @@ void set_title_blacklist(u64 tid, bool value) {
     ini_putl("blacklist", get_tid_str(tid), value, BLACKLIST_PATH);
 }
 
-} // namespace config
+}
diff --git a/common/config/config.hpp b/common/config/config.hpp
@@ -38,4 +38,4 @@ void set_default_title_volume(float value);
 auto get_title_blacklist(u64 tid) -> bool;
 void set_title_blacklist(u64 tid, bool value);
 
-} // namespace config
+}
diff --git a/common/pm/pm.cpp b/common/pm/pm.cpp
@@ -5,7 +5,7 @@ namespace {
 constexpr u64 QLAUNCH_TITLE_ID{0x0100000000001000ULL};
 u64 CURRENT_TITLE_ID{};
 
-} // namespace
+}
 
 namespace pm {
 
@@ -24,28 +24,28 @@ void Exit() {
 }
 
 // SOURCE: https://github.com/retronx-team/sys-clk/blob/570f1e5fe10b253eff0c8fda1bb893bb620af052/sysmodule/src/process_management.cpp#L37
-void getCurrentPidTid(u64& pid_out, u64& tid_out) {
+void getCurrentPidTid(u64* pid_out, u64* tid_out) {
     Result rc{};
-    if (R_SUCCEEDED(rc = pmdmntGetApplicationProcessId(&pid_out))) {
-        if (0x20f == pminfoGetProgramId(&tid_out, pid_out)){
-            tid_out = QLAUNCH_TITLE_ID;
+    if (R_SUCCEEDED(rc = pmdmntGetApplicationProcessId(pid_out))) {
+        if (0x20f == pminfoGetProgramId(tid_out, *pid_out)){
+            *tid_out = QLAUNCH_TITLE_ID;
         }
     } else if (rc == 0x20f) {
-        tid_out = QLAUNCH_TITLE_ID;
+        *tid_out = QLAUNCH_TITLE_ID;
     } else {
-        tid_out = CURRENT_TITLE_ID;
+        *tid_out = CURRENT_TITLE_ID;
     }
 }
 
-auto PollCurrentPidTid(u64& pid_out, u64& tid_out) -> bool {
+auto PollCurrentPidTid(u64* pid_out, u64* tid_out) -> bool {
     getCurrentPidTid(pid_out, tid_out);
 
-    if (tid_out != CURRENT_TITLE_ID) {
-        CURRENT_TITLE_ID = tid_out;
+    if (*tid_out != CURRENT_TITLE_ID) {
+        CURRENT_TITLE_ID = *tid_out;
         return true;
     }
 
     return false;
 }
 
-} // namespace pm
+}
diff --git a/common/pm/pm.hpp b/common/pm/pm.hpp
@@ -6,7 +6,7 @@ namespace pm {
 
 auto Initialize() -> Result;
 void Exit();
-void getCurrentPidTid(u64& pid_out, u64& tid_out);
-auto PollCurrentPidTid(u64& pid_out, u64& tid_out) -> bool;
+void getCurrentPidTid(u64* pid_out, u64* tid_out);
+auto PollCurrentPidTid(u64* pid_out, u64* tid_out) -> bool;
 
-} // namespace pm
+}
diff --git a/overlay/Makefile b/overlay/Makefile
@@ -76,7 +76,7 @@ CFLAGS	:=	-g -Wall -Wno-format-truncation -O2 -ffunction-sections \
 CFLAGS	+=	$(INCLUDE) -DVERSION=\"v$(APP_VERSION)\" -DTUNE_API_VERSION=$(API_VERSION) \
 			$(WANT_FLAGS)
 
-CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=gnu++23
+CXXFLAGS	:= $(CFLAGS) -fno-exceptions -std=c++23
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

diff --git a/overlay/source/gui_browser.cpp b/overlay/source/gui_browser.cpp
@@ -40,7 +40,7 @@ namespace {
 
     char path_buffer[FS_MAX_PATH];
 
-} // namespace
+}
 
 
 BrowserGui::BrowserGui()

diff --git a/overlay/source/gui_error.cpp b/overlay/source/gui_error.cpp
@@ -6,7 +6,7 @@ namespace {
 
     char result_buffer[10];
 
-} // namespace
+}
 
 ErrorGui::ErrorGui(const char *msg, Result rc) : m_msg(msg) {
     if (rc) {

diff --git a/overlay/source/gui_main.cpp b/overlay/source/gui_main.cpp
@@ -20,7 +20,7 @@ tsl::elm::Element *MainGui::createUI() {
     auto list  = new tsl::elm::List();
 
     u64 pid{}, tid{};
-    pm::getCurrentPidTid(pid, tid);
+    pm::getCurrentPidTid(&pid, &tid);
 
     /* Current track. */
     list->addItem(this->m_status_bar, tsl::style::ListItemDefaultHeight * 2);

diff --git a/overlay/source/main.cpp b/overlay/source/main.cpp
@@ -22,7 +22,7 @@ class SysTuneOverlay final : public tsl::Overlay {
 
         // don't open sys-tune if blacklisted title is active!
         u64 pid{}, tid{};
-        pm::getCurrentPidTid(pid, tid);
+        pm::getCurrentPidTid(&pid, &tid);
 
         if (config::get_title_blacklist(tid)) {
             this->msg =
@@ -33,7 +33,9 @@ class SysTuneOverlay final : public tsl::Overlay {
 
         Result rc = tuneInitialize();
 
-        if (R_VALUE(rc) == KERNELRESULT(NotFound)) {
+        // not found can happen if the service isn't started
+        // connection refused can happen is the service was terminated by pmshell
+        if (R_VALUE(rc) == KERNELRESULT(NotFound) || KERNELRESULT(ConnectionRefused)) {
             u64 pid = 0;
             const NcmProgramLocation programLocation{
                 .program_id = 0x4200000000000000,

diff --git a/sys-tune/Makefile b/sys-tune/Makefile
@@ -68,7 +68,7 @@ CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 CFLAGS	+=	$(INCLUDE) -DTUNE_API_VERSION=$(API_VERSION) \
 			$(WANT_FLAGS)
 
-CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++23
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=c++23
 
 ASFLAGS	:=	-g $(ARCH)
 LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)

diff --git a/sys-tune/nxExt/src/ipc_server.c b/sys-tune/nxExt/src/ipc_server.c
@@ -23,6 +23,16 @@ Result ipcServerInit(IpcServer* server, const char* name, u32 max_sessions)
     server->count = 0;
 
     Result rc = svcManageNamedPort(&server->handles[0], server->srvName.name, max_sessions);
+    if (R_FAILED(rc))
+    {
+        rc = svcManageNamedPort(&server->handles[0], server->srvName.name, 0);
+        if(R_SUCCEEDED(rc))
+        {
+            svcCloseHandle(server->handles[0]);
+            rc = svcManageNamedPort(&server->handles[0], server->srvName.name, max_sessions);
+        }
+    }
+
     if(R_SUCCEEDED(rc))
     {
         server->count = 1;
@@ -201,4 +211,3 @@ Result ipcServerProcess(IpcServer* server, IpcServerRequestHandler handler, void
 
     return rc;
 }
-
diff --git a/sys-tune/source/impl/music_player.cpp b/sys-tune/source/impl/music_player.cpp
@@ -224,7 +224,7 @@ namespace tune::impl {
             return 0;
         }
 
-    } // namespace
+    }
 
     Result Initialize(std::vector<PlaylistEntry>* playlist, std::vector<PlaylistID>* shuffle, PlaylistEntry* current) {
         g_playlist = playlist;
@@ -444,7 +444,7 @@ namespace tune::impl {
 
         while (g_should_run) {
             u64 pid{}, new_tid{};
-            if (pm::PollCurrentPidTid(pid, new_tid)) {
+            if (pm::PollCurrentPidTid(&pid, &new_tid)) {
                 // check if title is blacklisted
                 g_close_audren = config::get_title_blacklist(new_tid);
 

diff --git a/sys-tune/toolbox.json b/sys-tune/toolbox.json
@@ -1,5 +1,5 @@
 {
     "name"  : "sys-tune",
     "tid"   : "4200000000000000",
-    "requires_reboot": true
+    "requires_reboot": false
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ namespace { @@
         char path_buffer[FS_MAX_PATH];
-    } // namespace
+    }
     BrowserGui::BrowserGui()
@@ Expand Down @@