Add macOS code to open default browser, move the OpenURL function into a separate class.

Author: kblaschke

src/gui/CMakeLists.txt

@@ -31,7 +31,9 @@ add_library(ProjectMSDL-GUI STATIC
         ProjectMGUI.h
         ToastMessage.cpp
         ToastMessage.h
-        HelpWindow.cpp HelpWindow.h SettingsWindow.cpp SettingsWindow.h)
+        HelpWindow.cpp HelpWindow.h SettingsWindow.cpp SettingsWindow.h
+        SystemBrowser.cpp
+        SystemBrowser.h)
 
 target_include_directories(ProjectMSDL-GUI
         PUBLIC

src/gui/MainMenu.cpp

@@ -1,9 +1,11 @@
-#include "MainMenu.h"
+#include "gui/MainMenu.h"
 
-#include "ProjectMGUI.h"
 #include "ProjectMWrapper.h"
 #include "AudioCapture.h"
 
+#include "gui/ProjectMGUI.h"
+#include "gui/SystemBrowser.h"
+
 #include "notifications/PlaybackControlNotification.h"
 #include "notifications/QuitNotification.h"
 #include "notifications/UpdateWindowTitleNotification.h"
@@ -14,16 +16,6 @@
 
 #include <Poco/Util/Application.h>
 
-#ifdef __MSC_VER__
-#include <shellapi.h>
-#include <windows.h>
-#endif
-#ifdef __linux__
-#include <Poco/Process.h>
-#endif
-#ifdef __APPLE__
-#endif
-
 MainMenu::MainMenu(ProjectMGUI& gui)
     : _notificationCenter(Poco::NotificationCenter::defaultCenter())
     , _gui(gui)
@@ -159,28 +151,15 @@ void MainMenu::Draw()
 
             if (ImGui::MenuItem("Visit the projectM Wiki on GitHub"))
             {
-                OpenURL("https://github.com/projectM-visualizer/projectm/wiki");
+                SystemBrowser::OpenURL("https://github.com/projectM-visualizer/projectm/wiki");
             }
             if (ImGui::MenuItem("Report a Bug or Request a Feature"))
             {
-                OpenURL("https://github.com/projectM-visualizer/projectm/issues/new/choose");
+                SystemBrowser::OpenURL("https://github.com/projectM-visualizer/projectm/issues/new/choose");
             }
             ImGui::EndMenu();
         }
 
         ImGui::EndMainMenuBar();
     }
 }
-
-void MainMenu::OpenURL(const std::string& url)
-{
-#ifdef __MSC_VER__
-    ShellExecute(0, 0, url.c_str(), 0, 0, SW_SHOW);
-#endif
-#ifdef __linux__
-    auto handle = Poco::Process::launch("xdg-open", {url});
-    handle.wait();
-#endif
-#ifdef __APPLE__
-#endif
-}

src/gui/MainMenu.h

@@ -6,8 +6,7 @@ class ProjectMGUI;
 class ProjectMWrapper;
 class AudioCapture;
 
-namespace Poco
-{
+namespace Poco {
 class NotificationCenter;
 }
 
@@ -24,14 +23,6 @@ class MainMenu
     void Draw();
 
 private:
-    /**
-     * @brief Opens the given URL in the default browser, if the platform is supported.
-     *
-     * Only Windows (ShellExecute), macOS (LSOpenCFURLRef) and Linux (xdg-open) are currently supported.
-     * @param url The URL to open.
-     */
-    void OpenURL(const std::string& url);
-
     Poco::NotificationCenter& _notificationCenter; //!< Notification center instance.
     ProjectMGUI& _gui; //!< Reference to the GUI subsystem.
     ProjectMWrapper& _projectMWrapper; //!< Reference to the projectM wrapper subsystem.

src/gui/SystemBrowser.cpp

@@ -0,0 +1,29 @@
+#include "SystemBrowser.h"
+
+#ifdef __MSC_VER__
+#include <shellapi.h>
+#include <windows.h>
+#endif
+#ifdef __linux__
+#include <Poco/Process.h>
+#endif
+#ifdef __APPLE__
+#include <ApplicationServices/ApplicationServices.h>
+#include <CoreFoundation/CFBundle.h>
+#endif
+
+void SystemBrowser::OpenURL(const std::string& url)
+{
+#ifdef __MSC_VER__
+    ShellExecute(0, 0, url.c_str(), 0, 0, SW_SHOW);
+#endif
+#ifdef __linux__
+    auto handle = Poco::Process::launch("xdg-open", {url});
+    handle.wait();
+#endif
+#ifdef __APPLE__
+    CFURLRef urlRef = CFURLCreateWithBytes(nullptr, reinterpret_cast<UInt8*>(url.c_str()), url.length(), kCFStringEncodingASCII, nullptr);
+    LSOpenCFURLRef(urlRef, 0);
+    CFRelease(urlRef);
+#endif
+}

src/gui/SystemBrowser.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <string>
+
+class SystemBrowser
+{
+public:
+    /**
+     * @brief Opens the given URL in the default browser, if the platform is supported.
+     *
+     * Only Windows (ShellExecute), macOS (LSOpenCFURLRef) and Linux (xdg-open) are currently supported.
+     * @param url The URL to open.
+     */
+    static void OpenURL(const std::string& url);
+};