make mac work

fireph · Aug 14, 2018 · b9ffcc9 · b9ffcc9
1 parent 8f99c75
commit b9ffcc9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 18 deletions.
diff --git a/ObsSettingsDialog.cpp b/ObsSettingsDialog.cpp
@@ -173,10 +173,11 @@ void ObsSettingsDialog::selectApp()
     QFileDialog dialog(this);
     dialog.setFileMode(QFileDialog::ExistingFiles);
     QStringList filters;
-#ifdef WIN32
+#ifdef Q_OS_WIN
     dialog.setDirectory("C:\\Program Files (x86)");
     filters << "Exe files (*.exe)";
-#elif __APPLE__
+#endif
+#ifdef Q_OS_OSX
     dialog.setDirectory("/Applications");
     filters << "App files (*.app)";
 #endif

diff --git a/ObsUtils.cpp b/ObsUtils.cpp
@@ -1,10 +1,10 @@
+#include "ObsUtils.hpp"
+
 #ifdef Q_OS_OSX
 #include <libproc.h>
 #include "ObsUtilsOSX.hpp"
 #endif
 
-#include "ObsUtils.hpp"
-
 namespace ObsUtils
 {
 
@@ -13,8 +13,9 @@ namespace ObsUtils
         std::set<std::string> appsOpen;
 #ifdef Q_OS_WIN
         EnumWindows(EnumWindowsProcOpenApps, reinterpret_cast<LPARAM>(&appsOpen));
-#elif Q_OS_OSX
-        std::set<std::string> appsOpen = ObsUtilsOSX::getOpenApps();
+#endif
+#ifdef Q_OS_OSX
+        ObsUtilsOSX::setOpenApps(&appsOpen);
 #endif
         for (const auto &appToWatch : appsToWatch)
         {

diff --git a/ObsUtilsOSX.hpp b/ObsUtilsOSX.hpp
@@ -6,7 +6,7 @@
 
 namespace ObsUtilsOSX
 {
-    std::set<std::string> getOpenApps();
+    void setOpenApps(std::set<std::string>* appsOpen);
     void showDockIcon();
     void hideDockIcon();
 }

diff --git a/ObsUtilsOSX.mm b/ObsUtilsOSX.mm
@@ -5,24 +5,17 @@
 namespace ObsUtilsOSX
 {
 
-    std::set<std::string> getOpenApps()
+    void setOpenApps(std::set<std::string>* appsOpen)
     {
-        std::set<std::string> appsOpen;
         NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
         NSArray *apps = [workspace runningApplications];
 
         for (NSRunningApplication *a in apps) {
             if (a.bundleURL != nil) {
-                NSString *path = [a.bundleURL.absoluteString stringByRemovingPercentEncoding];
-                std::string filePath([path cStringUsingEncoding:NSUTF8StringEncoding]);
-                if (filePath.compare(filePath.size() - 1, 1, "/") == 0) {
-                    filePath = filePath.substr(0, filePath.size() - 1);
-                }
-                filePath = filePath.substr(filePath.find_last_of("/") + 1);
-                appsOpen.emplace(filePath);
+                std::string filename([a.bundleURL.lastPathComponent cStringUsingEncoding:NSUTF8StringEncoding]);
+                appsOpen->emplace(filename);
             }
         }
-        return appsOpen;
     }
 
     void showDockIcon()

diff --git a/obsautorecord.pro b/obsautorecord.pro
@@ -27,7 +27,7 @@ MOC_DIR = $$DESTDIR/.moc
 RCC_DIR = $$DESTDIR/.qrc
 UI_DIR = $$DESTDIR/.ui
 
-VERSION = 1.0.0.0
+VERSION = 2.0.1
 QMAKE_TARGET_COMPANY = "Frederick Meyer"
 QMAKE_TARGET_PRODUCT = "OBS Auto Record"
 QMAKE_TARGET_DESCRIPTION = "OBS Auto Record"