updated obs platform files

obs/CMakeLists.txt

@@ -34,7 +34,7 @@ if(WIN32)
 		platform-windows.cpp)
 elseif(APPLE)
 	set(obs_platform_src
-		platform-osx.cpp)
+		platform-osx.mm)
 elseif(UNIX)
 	set(obs_platform_src
 		platform-nix.cpp)

obs/makefile.am

@@ -26,7 +26,7 @@ obs_SOURCES += platform-windows.cpp
 endif
 
 if OS_OSX
-obs_SOURCES += platform-osx.cpp
+obs_SOURCES += platform-osx.mm
 endif
 
 if OS_NIX

obs/platform-osx.cpp → obs/platform-osx.mm

@@ -20,6 +20,8 @@
 
 #include <unistd.h>
 
+#import <AppKit/AppKit.h>
+
 bool GetDataFilePath(const char *data, string &output)
 {
 	stringstream str;
@@ -31,5 +33,10 @@ bool GetDataFilePath(const char *data, string &output)
 void GetMonitors(vector<MonitorInfo> &monitors)
 {
 	monitors.clear();
-	// TODO
+	for(NSScreen *screen : [NSScreen screens])
+	{
+		NSRect frame = [screen convertRectToBacking:[screen frame]];
+		monitors.emplace_back(frame.origin.x, frame.origin.y,
+				      frame.size.width, frame.size.height);
+	}
 }

obs/platform.hpp

@@ -26,6 +26,9 @@ using namespace std;
 struct MonitorInfo {
 	int32_t  x, y;
 	uint32_t cx, cy;
+	MonitorInfo(int32_t x, int32_t y, uint32_t cx, uint32_t cy)
+		: x(x), y(y), cx(cx), cy(cy)
+	{}
 };
 
 /* Gets the path of obs-studio specific data files (such as locale) */