[vlc-commits] mac plugin: re-add support for the legacy 32bit ObjC runtime

[Felix Paul Kühne]

npapi-vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Feb  9 23:08:40 2015 +0100| [b66033ddfe082ab1dcfb151ca1e3a7fba67c2ba4] | committer: Felix Paul Kühne

mac plugin: re-add support for the legacy 32bit ObjC runtime

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=b66033ddfe082ab1dcfb151ca1e3a7fba67c2ba4
---

 npapi/vlcplugin_mac.mm |   40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/npapi/vlcplugin_mac.mm b/npapi/vlcplugin_mac.mm
index ed4c317..251f8a7 100644
--- a/npapi/vlcplugin_mac.mm
+++ b/npapi/vlcplugin_mac.mm
@@ -51,16 +51,20 @@ CGImageRef createImageNamed(NSString *);
 #pragma mark - objc class interfaces
 
 @interface VLCNoMediaLayer : CALayer
+{
+    VlcPluginMac *_cppPlugin;
+}
 
- at property (readwrite) VlcPluginMac * cppPlugin;
+ at property (readwrite) VlcPluginMac *cppPlugin;
 
 @end
 
 @interface VLCBrowserRootLayer : CALayer {
     NSTimer *_interfaceUpdateTimer;
+    VlcPluginMac *_cppPlugin;
 }
 
- at property (readwrite) VlcPluginMac * cppPlugin;
+ at property (readwrite) VlcPluginMac *cppPlugin;
 
 - (void)startUIUpdateTimer;
 
@@ -85,11 +89,16 @@ CGImageRef createImageNamed(NSString *);
     BOOL _wasPlayingBeforeMouseDown;
     BOOL _isScrubbing;
     CGFloat _mouseDownXDelta;
+
+    double _mediaPosition;
+    BOOL _isPlaying;
+    BOOL _isFullscreen;
+    VlcPluginMac *_cppPlugin;
 }
 @property (readwrite) double mediaPosition;
 @property (readwrite) BOOL isPlaying;
 @property (readwrite) BOOL isFullscreen;
- at property (readwrite) VlcPluginMac * cppPlugin;
+ at property (readwrite) VlcPluginMac *cppPlugin;
 
 - (void)handleMouseDown:(CGPoint)point;
 - (void)handleMouseUp:(CGPoint)point;
@@ -113,7 +122,7 @@ CGImageRef createImageNamed(NSString *);
     VlcPluginMac *_cppPlugin;
     NSTimeInterval _timeSinceLastMouseMove;
 }
- at property (readwrite) VlcPluginMac * cppPlugin;
+ at property (readwrite) VlcPluginMac *cppPlugin;
 
 - (void)hideToolbar;
 
@@ -123,7 +132,7 @@ CGImageRef createImageNamed(NSString *);
     NSRect _initialFrame;
     VLCFullscreenContentView *_customContentView;
 }
- at property (readonly) VLCFullscreenContentView* customContentView;
+ at property (readonly) VLCFullscreenContentView *customContentView;
 
 - (id)initWithContentRect:(NSRect)contentRect;
 
@@ -136,6 +145,15 @@ CGImageRef createImageNamed(NSString *);
 @end
 
 @interface VLCPerInstanceStorage : NSObject
+{
+    VlcPluginMac *_cppPlugin;
+    VLCBrowserRootLayer *_browserRootLayer;
+    VLCPlaybackLayer *_playbackLayer;
+    VLCNoMediaLayer *_noMediaLayer;
+    VLCControllerLayer *_controllerLayer;
+    VLCFullscreenWindow *_fullscreenWindow;
+    VLCFullscreenContentView *_fullscreenView;
+}
 
 @property (readwrite, assign) VlcPluginMac *cppPlugin;
 @property (readwrite, retain) VLCBrowserRootLayer *browserRootLayer;
@@ -149,6 +167,8 @@ CGImageRef createImageNamed(NSString *);
 
 @implementation VLCPerInstanceStorage
 
+ at synthesize cppPlugin = _cppPlugin, browserRootLayer = _browserRootLayer, playbackLayer = _playbackLayer, noMediaLayer = _noMediaLayer, controllerLayer = _controllerLayer, fullscreenWindow = _fullscreenWindow, fullscreenView = _fullscreenView;
+
 @end
 
 #pragma mark - handling of c++ bindings
@@ -447,6 +467,8 @@ bool VlcPluginMac::handle_event(void *event)
 
 @implementation VLCBrowserRootLayer
 
+ at synthesize cppPlugin = _cppPlugin;
+
 - (id)init
 {
     if (self = [super init]) {
@@ -535,6 +557,8 @@ bool VlcPluginMac::handle_event(void *event)
 
 @implementation VLCNoMediaLayer
 
+ at synthesize cppPlugin = _cppPlugin;
+
 - (id)init
 {
     if (self = [super init]) {
@@ -681,6 +705,8 @@ bool VlcPluginMac::handle_event(void *event)
 
 @implementation VLCControllerLayer
 
+ at synthesize cppPlugin = _cppPlugin, mediaPosition = _mediaPosition, isPlaying = _isPlaying, isFullscreen = _isFullscreen;
+
 - (id)init
 {
     if (self = [super init]) {
@@ -891,6 +917,8 @@ bool VlcPluginMac::handle_event(void *event)
 
 @implementation VLCFullscreenWindow
 
+ at synthesize customContentView = _customContentView;
+
 - (id)initWithContentRect:(NSRect)contentRect
 {
     if (self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO]) {
@@ -926,6 +954,8 @@ bool VlcPluginMac::handle_event(void *event)
 
 @implementation VLCFullscreenContentView
 
+ at synthesize cppPlugin = _cppPlugin;
+
 - (BOOL)acceptsFirstResponder
 {
     return YES;