Fix aroma beta 17 incompatibilities, fix debug logger, bump version

Dockerfile

@@ -1,10 +1,10 @@
-FROM ghcr.io/wiiu-env/devkitppc:20231112
+FROM ghcr.io/wiiu-env/devkitppc:20240505
 
-COPY --from=ghcr.io/wiiu-env/libnotifications:20230621 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libnotifications:20240426  /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libkernel:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libmocha:20231127 /artifacts $DEVKITPRO
-COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230719 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20240505 /artifacts $DEVKITPRO
 
 WORKDIR /app
 CMD make -f Makefile -j$(nproc)

Makefile

@@ -24,6 +24,7 @@ BUILD		:=	build
 SOURCES		:=	src src/patches src/utils src/ext/inih
 DATA		:=	data
 INCLUDES	:=	src src/ext/inih
+#DEBUG		:=	1
 
 #-------------------------------------------------------------------------------
 # options for code generation
@@ -33,6 +34,10 @@ CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
 
 CFLAGS	+=	$(INCLUDE) -D__WIIU__ -D__WUT__ -D__WUPS__
 
+ifeq ($(DEBUG),1)
+	CFLAGS += -DDEBUG
+endif
+
 CXXFLAGS	:= $(CFLAGS) -std=c++20
 
 ASFLAGS	:=	-g $(ARCH)

src/Notification.cpp

@@ -15,41 +15,17 @@
 */
 
 #include "Notification.h"
-#include <coreinit/cache.h>
-#include <coreinit/thread.h>
-#include <coreinit/title.h>
 #include <notifications/notification_defines.h>
 #include <notifications/notifications.h>
-#include <thread>
 
-static std::unique_ptr<std::thread> sShowHintThread;
-static bool sShutdownHintThread = false;
+void ShowNotification(std::string_view notification) {
+    auto err1 = NotificationModule_SetDefaultValue(NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO,
+                                                   NOTIFICATION_MODULE_DEFAULT_OPTION_KEEP_UNTIL_SHOWN, true);
+    auto err2 = NotificationModule_SetDefaultValue(NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO,
+                                                   NOTIFICATION_MODULE_DEFAULT_OPTION_DURATION_BEFORE_FADE_OUT,
+                                                   15.0f);
+
+    if (err1 != NOTIFICATION_MODULE_RESULT_SUCCESS || err2 != NOTIFICATION_MODULE_RESULT_SUCCESS) return;
 
-void ShowNotification(const char * notification) {
-    // Wait for notification module to be ready
-    bool isOverlayReady = false;
-    while (!sShutdownHintThread && NotificationModule_IsOverlayReady(&isOverlayReady) == NOTIFICATION_MODULE_RESULT_SUCCESS && !isOverlayReady)
-        OSSleepTicks(OSMillisecondsToTicks(16));
-    if (sShutdownHintThread || !isOverlayReady) return;
-    NotificationModuleStatus err = NotificationModule_SetDefaultValue(NOTIFICATION_MODULE_NOTIFICATION_TYPE_INFO, NOTIFICATION_MODULE_DEFAULT_OPTION_DURATION_BEFORE_FADE_OUT, 15.0f);
-    if(err != NOTIFICATION_MODULE_RESULT_SUCCESS) return;
-
-    NotificationModule_AddInfoNotification(notification);
-}
-
-void StartNotificationThread(const char * value) {
-    uint64_t titleID = OSGetTitleID();
-    if (titleID == 0x0005001010040000L || titleID == 0x0005001010040100L || titleID == 0x0005001010040200L) {
-        sShutdownHintThread = false;
-        sShowHintThread = std::make_unique<std::thread>(ShowNotification, value);
-    }
-}
-
-void StopNotificationThread() {
-    if (sShowHintThread != nullptr) {
-        sShutdownHintThread = true;
-        OSMemoryBarrier();
-        sShowHintThread->join();
-        sShowHintThread.reset();
-    }
+    NotificationModule_AddInfoNotification(notification.data());
 }

src/Notification.h

@@ -1,7 +1,5 @@
 #pragma once
 
-void ShowNotification(const char * notification);
+#include <string_view>
 
-void StartNotificationThread(const char * value);
-
-void StopNotificationThread();
+void ShowNotification(std::string_view notification);