Dockerfile

@@ -1,6 +1,6 @@
-FROM ghcr.io/wiiu-env/devkitppc:20240704
+FROM ghcr.io/wiiu-env/devkitppc:20240423
 
-COPY --from=ghcr.io/wiiu-env/libnotifications:20240426 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/libnotifications:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libmappedmemory:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/libfunctionpatcher:20230621 /artifacts $DEVKITPRO
 COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:20240424 /artifacts $DEVKITPRO

src/export.cpp

@@ -9,28 +9,17 @@ void ExportCleanUp() {
     std::lock_guard<std::mutex> lock(gNotificationListMutex);
     gNotificationList.clear();
     std::lock_guard overlay_lock(gOverlayFrameMutex);
-
-    // Remove notification in queue that should not survive
-    std::vector<std::shared_ptr<Notification>> keepQueue;
-    for (const auto &notification : gOverlayQueueDuringStartup) {
-        if (notification->isKeepUntilShown()) {
-            keepQueue.push_back(notification);
-        } else {
-        }
-    }
     gOverlayQueueDuringStartup.clear();
-    gOverlayQueueDuringStartup = keepQueue;
 }
 
-NotificationModuleStatus NMAddStaticNotificationV2(const char *text,
-                                                   NotificationModuleNotificationType type,
-                                                   float durationBeforeFadeOutInSeconds,
-                                                   float shakeDurationInSeconds,
-                                                   NMColor textColor,
-                                                   NMColor backgroundColor,
-                                                   void (*finishFunc)(NotificationModuleHandle, void *context),
-                                                   void *context,
-                                                   bool keepUntilShown) {
+NotificationModuleStatus NMAddStaticNotification(const char *text,
+                                                 NotificationModuleNotificationType type,
+                                                 float durationBeforeFadeOutInSeconds,
+                                                 float shakeDurationInSeconds,
+                                                 NMColor textColor,
+                                                 NMColor backgroundColor,
+                                                 void (*finishFunc)(NotificationModuleHandle, void *context),
+                                                 void *context) {
 
     NotificationStatus status;
     switch (type) {
@@ -51,16 +40,14 @@ NotificationModuleStatus NMAddStaticNotificationV2(const char *text,
             (GX2Color){textColor.r, textColor.g, textColor.b, textColor.a},
             (GX2Color){backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a},
             finishFunc,
-            context,
-            nullptr,
-            keepUntilShown);
+            context);
     if (!notification) {
         return NOTIFICATION_MODULE_RESULT_ALLOCATION_FAILED;
     }
 
     {
         std::lock_guard lock(gOverlayFrameMutex);
-        if (gOverlayFrame && gDrawReady) {
+        if (gOverlayFrame) {
             gOverlayFrame->addNotification(std::move(notification));
         } else {
             gOverlayQueueDuringStartup.push_back(std::move(notification));
@@ -70,18 +57,6 @@ NotificationModuleStatus NMAddStaticNotificationV2(const char *text,
     return NOTIFICATION_MODULE_RESULT_SUCCESS;
 }
 
-
-NotificationModuleStatus NMAddStaticNotification(const char *text,
-                                                 NotificationModuleNotificationType type,
-                                                 float durationBeforeFadeOutInSeconds,
-                                                 float shakeDurationInSeconds,
-                                                 NMColor textColor,
-                                                 NMColor backgroundColor,
-                                                 void (*finishFunc)(NotificationModuleHandle, void *context),
-                                                 void *context) {
-    return NMAddStaticNotificationV2(text, type, durationBeforeFadeOutInSeconds, shakeDurationInSeconds, textColor, backgroundColor, finishFunc, context, false);
-}
-
 void NMNotificationRemovedFromOverlay(Notification *notification) {
     if (notification) {
         auto handle = notification->getHandle();
@@ -91,13 +66,12 @@ void NMNotificationRemovedFromOverlay(Notification *notification) {
     }
 }
 
-NotificationModuleStatus NMAddDynamicNotificationV2(const char *text,
-                                                    NMColor textColor,
-                                                    NMColor backgroundColor,
-                                                    void (*finishFunc)(NotificationModuleHandle, void *context),
-                                                    void *context,
-                                                    bool keep_until_shown,
-                                                    NotificationModuleHandle *outHandle) {
+NotificationModuleStatus NMAddDynamicNotification(const char *text,
+                                                  NMColor textColor,
+                                                  NMColor backgroundColor,
+                                                  void (*finishFunc)(NotificationModuleHandle, void *context),
+                                                  void *context,
+                                                  NotificationModuleHandle *outHandle) {
     if (outHandle == nullptr) {
         return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
     }
@@ -112,8 +86,7 @@ NotificationModuleStatus NMAddDynamicNotificationV2(const char *text,
             (GX2Color){backgroundColor.r, backgroundColor.g, backgroundColor.b, backgroundColor.a},
             finishFunc,
             context,
-            NMNotificationRemovedFromOverlay,
-            keep_until_shown);
+            NMNotificationRemovedFromOverlay);
     if (!notification) {
         return NOTIFICATION_MODULE_RESULT_ALLOCATION_FAILED;
     }
@@ -135,15 +108,6 @@ NotificationModuleStatus NMAddDynamicNotificationV2(const char *text,
     return NOTIFICATION_MODULE_RESULT_SUCCESS;
 }
 
-NotificationModuleStatus NMAddDynamicNotification(const char *text,
-                                                  NMColor textColor,
-                                                  NMColor backgroundColor,
-                                                  void (*finishFunc)(NotificationModuleHandle, void *context),
-                                                  void *context,
-                                                  NotificationModuleHandle *outHandle) {
-    return NMAddDynamicNotificationV2(text, textColor, backgroundColor, finishFunc, context, false, outHandle);
-}
-
 NotificationModuleStatus NMUpdateDynamicNotificationText(NotificationModuleHandle handle,
                                                          const char *text) {
     NotificationModuleStatus res = NOTIFICATION_MODULE_RESULT_INVALID_HANDLE;
@@ -232,12 +196,10 @@ NotificationModuleStatus NMGetVersion(NotificationModuleAPIVersion *outVersion)
     if (outVersion == nullptr) {
         return NOTIFICATION_MODULE_RESULT_INVALID_ARGUMENT;
     }
-    *outVersion = 2;
+    *outVersion = 1;
     return NOTIFICATION_MODULE_RESULT_SUCCESS;
 }
 
-WUMS_EXPORT_FUNCTION(NMAddDynamicNotificationV2);
-WUMS_EXPORT_FUNCTION(NMAddStaticNotificationV2);
 WUMS_EXPORT_FUNCTION(NMAddDynamicNotification);
 WUMS_EXPORT_FUNCTION(NMAddStaticNotification);
 WUMS_EXPORT_FUNCTION(NMUpdateDynamicNotificationText);

src/function_patches.cpp

@@ -71,21 +71,8 @@ void drawScreenshotSavedTexture2(GX2ColorBuffer *colorBuffer, GX2ScanTarget scan
     drawIntoColorBuffer(colorBuffer, gOverlayFrame, scan_target);
 }
 
-static void TryAddFromQueue() {
-    if (!gOverlayFrame) {
-        return;
-    }
-    std::lock_guard overlay_lock(gOverlayFrameMutex);
-    // Add notification that had been called before the overlay was ready
-    for (const auto &notification : gOverlayQueueDuringStartup) {
-        gOverlayFrame->addNotification(notification);
-    }
-    gOverlayQueueDuringStartup.clear();
-}
-
 DECL_FUNCTION(void, GX2CopyColorBufferToScanBuffer, const GX2ColorBuffer *colorBuffer, GX2ScanTarget scan_target) {
     gDrawReady = true;
-    TryAddFromQueue();
     if (drawScreenshotSavedTexture(colorBuffer, scan_target)) {
         // if it returns true we don't need to call GX2CopyColorBufferToScanBuffer
         return;
@@ -130,6 +117,12 @@ DECL_FUNCTION(void, GX2Init, uint32_t attributes) {
             OSFatal("NotificationModule: Failed to alloc gOverlayFrame");
         }
 
+        // Add notification that had been called before the overlay was ready
+        for (const auto &notification : gOverlayQueueDuringStartup) {
+            gOverlayFrame->addNotification(notification);
+        }
+        gOverlayQueueDuringStartup.clear();
+
         // Allocate shader.
         if (ColorShader::instance() == nullptr) {
             OSFatal("NotificationModule: Failed to alloc ColorShader");
@@ -150,7 +143,6 @@ DECL_FUNCTION(void, GX2Init, uint32_t attributes) {
 
 DECL_FUNCTION(void, GX2MarkScanBufferCopied, GX2ScanTarget scan_target) {
     gDrawReady = true;
-    TryAddFromQueue();
     if (scan_target == GX2_SCAN_TARGET_TV) {
         drawScreenshotSavedTexture2(&lastTVColorBuffer, scan_target);
     } else {

src/gui/Notification.cpp

@@ -8,8 +8,7 @@ Notification::Notification(const std::string &overlayText,
                            GX2Color backgroundColor,
                            void (*finishFunc)(NotificationModuleHandle, void *),
                            void *context,
-                           void (*removedFromOverlayCallback)(Notification *),
-                           bool keepUntilShown) : GuiFrame(0, 0), mBackground(0, 0, backgroundColor) {
+                           void (*removedFromOverlayCallback)(Notification *)) : GuiFrame(0, 0), mBackground(0, 0, backgroundColor) {
     mFinishFunction              = finishFunc;
     mFinishFunctionContext       = context;
     mRemovedFromOverlayCallback  = removedFromOverlayCallback;
@@ -21,7 +20,6 @@ Notification::Notification(const std::string &overlayText,
     mNotificationText.setPosition(0, 0);
     mNotificationText.setFontSize(20);
     mNotificationText.setAlignment(ALIGN_CENTERED);
-    mKeepUntilShown = keepUntilShown;
 
     updateStatus(status);
 

src/gui/Notification.h

@@ -35,8 +35,7 @@ public:
                           GX2Color backgroundColor                             = {100, 100, 100, 255},
                           void (*finishFunc)(NotificationModuleHandle, void *) = nullptr,
                           void *context                                        = nullptr,
-                          void (*removedFromOverlayCallback)(Notification *)   = nullptr,
-                          bool keepUntilShown                                  = false);
+                          void (*removedFromOverlayCallback)(Notification *)   = nullptr);
 
     ~Notification() override;
 
@@ -91,10 +90,6 @@ public:
         mPositionSet = true;
     }
 
-    [[nodiscard]] bool isKeepUntilShown() const {
-        return mKeepUntilShown;
-    }
-
 private:
     std::function<void(NotificationModuleHandle, void *)> mFinishFunction;
     std::function<void(Notification *)> mRemovedFromOverlayCallback;
@@ -111,8 +106,6 @@ private:
     bool mTextDirty   = false;
     bool mPositionSet = false;
 
-    bool mKeepUntilShown = false;
-
     NotificationStatus mStatus                 = NOTIFICATION_STATUS_INFO;
     NotificationInternalStatus mInternalStatus = NOTIFICATION_STATUS_NOTHING;
 };

src/gui/Timer.h

@@ -3,15 +3,15 @@
 
 class Timer {
 public:
-    Timer() { clock_gettime(CLOCK_MONOTONIC, &beg_); }
+    Timer() { clock_gettime(CLOCK_REALTIME, &beg_); }
 
     double elapsed() {
-        clock_gettime(CLOCK_MONOTONIC, &end_);
+        clock_gettime(CLOCK_REALTIME, &end_);
         return end_.tv_sec - beg_.tv_sec +
                (end_.tv_nsec - beg_.tv_nsec) / 1000000000.;
     }
 
-    void reset() { clock_gettime(CLOCK_MONOTONIC, &beg_); }
+    void reset() { clock_gettime(CLOCK_REALTIME, &beg_); }
 
 private:
     timespec beg_, end_;

src/main.cpp

@@ -11,7 +11,7 @@
 
 WUMS_MODULE_EXPORT_NAME("homebrew_notifications");
 
-#define VERSION "v0.1.3"
+#define VERSION "v0.1.2"
 
 WUMS_DEPENDS_ON(homebrew_memorymapping);
 WUMS_DEPENDS_ON(homebrew_functionpatcher);