[vlc-commits] macosx: SPMediaKeyTap: Move ivars out of header

[Marvin Scholz]

vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Aug  1 21:10:58 2018 +0200| [1e90394e93e77e0cb2325844441db3885ee403d7] | committer: Felix Paul Kühne

macosx: SPMediaKeyTap: Move ivars out of header

(cherry picked from commit 5e4bf8dbefff89eeed1cebe51e7eab6ddcf716a3)
Signed-off-by: Felix Paul Kühne <felix at feepk.net>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=1e90394e93e77e0cb2325844441db3885ee403d7
---

 modules/gui/macosx/SPMediaKeyTap.h | 13 ++-----------
 modules/gui/macosx/SPMediaKeyTap.m | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/gui/macosx/SPMediaKeyTap.h b/modules/gui/macosx/SPMediaKeyTap.h
index ffc973307d..092e56d5f5 100644
--- a/modules/gui/macosx/SPMediaKeyTap.h
+++ b/modules/gui/macosx/SPMediaKeyTap.h
@@ -29,17 +29,8 @@
 
 #define SPSystemDefinedEventMediaKeys 8
 
- at interface SPMediaKeyTap : NSObject {
-    EventHandlerRef _app_switching_ref;
-    EventHandlerRef _app_terminating_ref;
-    CFMachPortRef _eventPort;
-    CFRunLoopSourceRef _eventPortSource;
-    CFRunLoopRef _tapThreadRL;
-    BOOL _shouldInterceptMediaKeyEvents;
-    id _delegate;
-    // The app that is frontmost in this list owns media keys
-    NSMutableArray *_mediaKeyAppList;
-}
+ at interface SPMediaKeyTap : NSObject
+
 + (NSArray*)defaultMediaKeyUserBundleIdentifiers;
 
 - (id)initWithDelegate:(id)delegate;
diff --git a/modules/gui/macosx/SPMediaKeyTap.m b/modules/gui/macosx/SPMediaKeyTap.m
index 06d3d0f627..8b9d9fe4bb 100644
--- a/modules/gui/macosx/SPMediaKeyTap.m
+++ b/modules/gui/macosx/SPMediaKeyTap.m
@@ -25,7 +25,18 @@
 #import "SPMediaKeyTap.h"
 #import "SPInvocationGrabbing.h"
 
- at interface SPMediaKeyTap ()
+ at interface SPMediaKeyTap () {
+    EventHandlerRef _app_switching_ref;
+    EventHandlerRef _app_terminating_ref;
+    CFMachPortRef _eventPort;
+    CFRunLoopSourceRef _eventPortSource;
+    CFRunLoopRef _tapThreadRL;
+    BOOL _shouldInterceptMediaKeyEvents;
+    id _delegate;
+    // The app that is frontmost in this list owns media keys
+    NSMutableArray *_mediaKeyAppList;
+}
+
 - (BOOL)shouldInterceptMediaKeyEvents;
 - (void)setShouldInterceptMediaKeyEvents:(BOOL)newSetting;
 - (void)startWatchingAppSwitching;