Commit 11c628ea authored by Faustino Osuna's avatar Faustino Osuna

MacOSX/Framework: Remove all references to fullscreen mode, it should be the...

MacOSX/Framework: Remove all references to fullscreen mode, it should be the host application's responsibility to transition between fullscreen and window mode.
parent dfc28997
...@@ -93,9 +93,6 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state); ...@@ -93,9 +93,6 @@ extern NSString * VLCMediaPlayerStateToString(VLCMediaPlayerState state);
- (void)setVideoView:(VLCVideoView *)aVideoView; - (void)setVideoView:(VLCVideoView *)aVideoView;
- (void)setVideoLayer:(VLCVideoLayer *)aVideoLayer; - (void)setVideoLayer:(VLCVideoLayer *)aVideoLayer;
- (void)setFullscreen:(BOOL)value;
- (BOOL)fullscreen;
- (void)setVideoAspectRatio:(char *)value; - (void)setVideoAspectRatio:(char *)value;
- (char *)videoAspectRatio; - (char *)videoAspectRatio;
- (void)setVideoSubTitles:(int)value; - (void)setVideoSubTitles:(int)value;
......
...@@ -24,30 +24,19 @@ ...@@ -24,30 +24,19 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
@class CALayer;
/* Notifications */
extern NSString * VLCVideoViewEnteredFullScreen;
extern NSString * VLCVideoViewLeftFullScreen;
@protocol VLCVideoViewDelegate @class CALayer;
// Notifications defined in VLCVideoView.h
- (void)videoEnteredFullscreen:(NSNotification *)aNotification;
- (void)videoLeftFullscreen:(NSNotification *)aNotification;
@end
@interface VLCVideoView : NSView @interface VLCVideoView : NSView
{ {
id delegate; id delegate;
NSColor * backColor; NSColor * backColor;
BOOL stretchesVideo; BOOL stretchesVideo;
BOOL fullScreen;
id layoutManager; id layoutManager;
// TODO: Allow for view to report transparency to do some cool effects // TODO: Allow for view to report transparency to do some cool effects
// with the video? // with the video?
} }
@property BOOL fullScreen;
@property BOOL fillScreen; @property BOOL fillScreen;
- (void)setDelegate:(id)value; - (void)setDelegate:(id)value;
...@@ -55,12 +44,4 @@ extern NSString * VLCVideoViewLeftFullScreen; ...@@ -55,12 +44,4 @@ extern NSString * VLCVideoViewLeftFullScreen;
- (void)setBackColor:(NSColor *)value; - (void)setBackColor:(NSColor *)value;
- (NSColor *)backColor; - (NSColor *)backColor;
- (void)enterFullscreen;
- (void)leaveFullscreen;
//- (void)setOnTop: (BOOL)ontop; /* Do we really want that in protocol? */
// The media controls that were here previously should be moved elsewhere. This
// View is just that, a view not a controller. -- Moved to VLCMediaPlayer
@end @end
...@@ -204,20 +204,6 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void * ...@@ -204,20 +204,6 @@ static void HandleMediaInstanceStateChanged(const libvlc_event_t * event, void *
[self setDrawable: aVideoLayer]; [self setDrawable: aVideoLayer];
} }
- (void)setFullscreen:(BOOL)value
{
libvlc_set_fullscreen(instance, value, NULL);
}
- (BOOL)fullscreen
{
libvlc_exception_t ex;
libvlc_exception_init( &ex );
int result = libvlc_get_fullscreen( instance, &ex );
catch_exception( &ex );
return result;
}
- (void)setVideoAspectRatio:(char *)value - (void)setVideoAspectRatio:(char *)value
{ {
libvlc_video_set_aspect_ratio( instance, value, NULL ); libvlc_video_set_aspect_ratio( instance, value, NULL );
......
...@@ -32,10 +32,6 @@ ...@@ -32,10 +32,6 @@
#import <QuartzCore/QuartzCore.h> #import <QuartzCore/QuartzCore.h>
/* Notifications */
NSString * VLCVideoViewEnteredFullScreen = @"VLCVideoViewEnteredFullScreen";
NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
/****************************************************************************** /******************************************************************************
* Soon deprecated stuff * Soon deprecated stuff
*/ */
...@@ -146,26 +142,6 @@ NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen"; ...@@ -146,26 +142,6 @@ NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
[[self layer] setNeedsLayout]; [[self layer] setNeedsLayout];
} }
- (BOOL)fullScreen
{
return fullScreen;
}
- (void)setFullScreen:(BOOL)newFullScreen
{
if( newFullScreen )
{
fullScreen = YES;
[self enterFullscreen];
}
else
{
fullScreen = NO;
[self leaveFullscreen];
}
}
- (id)initWithFrame:(NSRect)rect - (id)initWithFrame:(NSRect)rect
{ {
if (self = [super initWithFrame:rect]) if (self = [super initWithFrame:rect])
...@@ -212,33 +188,6 @@ NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen"; ...@@ -212,33 +188,6 @@ NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
return backColor; return backColor;
} }
/* This is a LibVLC notification that we're about to enter into full screen,
there is no other place where I can see where we can trap this event */
- (void)enterFullscreen
{
// Go ahead and send a notification to the world we're going into full screen
[[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
withDelegateMethod:nil
withNotificationName:VLCVideoViewEnteredFullScreen];
[super enterFullScreenMode:[[self window] screen] withOptions:nil];
if( !self.fullScreen ) self.fullScreen = YES;
}
/* This is a LibVLC notification that we're about to enter leaving full screen,
there is no other place where I can see where we can trap this event */
- (void)leaveFullscreen
{
// Go ahead and send a notification to the world we're leaving full screen
[[VLCEventManager sharedManager] callOnMainThreadDelegateOfObject:self
withDelegateMethod:nil
withNotificationName:VLCVideoViewLeftFullScreen];
// There is nothing else to do, as this object strictly displays the video feed
[super exitFullScreenModeWithOptions:nil];
if( self.fullScreen ) self.fullScreen = NO;
}
- (void)drawRect:(NSRect)aRect - (void)drawRect:(NSRect)aRect
{ {
[self lockFocus]; [self lockFocus];
...@@ -251,16 +200,6 @@ NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen"; ...@@ -251,16 +200,6 @@ NSString * VLCVideoViewLeftFullScreen = @"VLCVideoViewLeftFullScreen";
{ {
return YES; return YES;
} }
- (void)mouseDown:(NSEvent *)theEvent
{
if([theEvent clickCount] != 2)
return;
if(self.fullScreen)
[self leaveFullscreen];
else
[self enterFullscreen];
}
@end @end
/****************************************************************************** /******************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment