libmythui: Cleanup osx utility code

mythtv/libs/libmythui/libmythui.pro

@@ -110,14 +110,14 @@ using_qtdbus {
 }
 
 macx {
-    HEADERS += screensaver-osx.h   util-osx.h
-    SOURCES += screensaver-osx.cpp util-osx.cpp
+    HEADERS += screensaver-osx.h   platforms/mythosxutils.h
+    SOURCES += screensaver-osx.cpp platforms/mythosxutils.cpp
     HEADERS += platforms/mythdisplayosx.h
     SOURCES += platforms/mythdisplayosx.cpp
     QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_CXXFLAGS
     QMAKE_OBJECTIVE_CXXFLAGS += $$QMAKE_CXXFLAGS
-    OBJECTIVE_HEADERS += util-osx-cocoa.h
-    OBJECTIVE_SOURCES += util-osx-cocoa.mm
+    OBJECTIVE_HEADERS += platforms/mythutilscocoa.h
+    OBJECTIVE_SOURCES += platforms/mythutilscocoa.mm
     LIBS              += -framework Cocoa -framework IOKit
 
     using_appleremote {

mythtv/libs/libmythui/platforms/mythdisplayosx.cpp

@@ -3,7 +3,7 @@
 #include "mythcorecontext.h"
 #include "mythmainwindow.h"
 #include "mythdisplayosx.h"
-#import "util-osx.h"
+#import  "mythosxutils.h"
 
 #define LOC QString("DisplayOSX: ")
 

mythtv/libs/libmythui/util-osx.cpp → mythtv/libs/libmythui/platforms/mythosxutils.cpp

@@ -13,9 +13,14 @@
  * Nigel Pearson
  *****************************************************************************/
 
-#import "util-osx.h"
-#import "util-osx-cocoa.h"
+// MythTV
+#import "mythosxutils.h"
+#import "mythutilscocoa.h"
+
+// OSX
 #import <CoreFoundation/CFNumber.h>
+
+// Std
 #include <cstdio>
 
 int get_int_CF(CFDictionaryRef dict, CFStringRef key)

mythtv/libs/libmythui/util-osx.h → mythtv/libs/libmythui/platforms/mythosxutils.h

@@ -1,10 +1,15 @@
-#ifndef UTIL_OSX_H
-#define UTIL_OSX_H
+#ifndef MYTHOSXUTILS_H_
+#define MYTHOSXUTILS_H_
 
+// Qt
+#include <QWidget> // for WId
+
+// MythTV
+#include "mythuiexp.h"
+
+// OSX
 #import <CoreFoundation/CFDictionary.h> 
 #import <ApplicationServices/ApplicationServices.h>
-#include "mythuiexp.h"
-#include <QWidget> // for WId
 
 MUI_PUBLIC int    get_int_CF(CFDictionaryRef dict, CFStringRef key);
 MUI_PUBLIC float  get_float_CF(CFDictionaryRef dict, CFStringRef key);

mythtv/libs/libmythui/platforms/mythutilscocoa.h

@@ -0,0 +1,12 @@
+#ifndef MYTHUTILSCOCOA_H_
+#define MYTHUTILSCOCOA_H_
+
+// MythTV
+#include "mythuiexp.h"
+
+// OSX
+#import "ApplicationServices/ApplicationServices.h"
+
+CGDirectDisplayID GetOSXCocoaDisplay(void* view);
+
+#endif // MYTHUTILSCOCOA_H_

mythtv/libs/libmythui/platforms/mythutilscocoa.mm

@@ -0,0 +1,14 @@
+// MythTV
+#include "mythutilscocoa.h"
+
+CGDirectDisplayID GetOSXCocoaDisplay(void* view)
+{
+    NSView *thisview = static_cast<NSView *>(view);
+    if (!thisview)
+        return 0;
+    NSScreen *screen = [[thisview window] screen];
+    if (!screen)
+        return 0;
+    NSDictionary* desc = [screen deviceDescription];
+    return (CGDirectDisplayID)[[desc objectForKey:@"NSScreenNumber"] intValue];
+}