Commit 4168ec37 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont

macosx: Remove VLCEmbeddedDetachedVout because it's not used. (Or at leat...

macosx: Remove VLCEmbeddedDetachedVout because it's not used. (Or at leat doesn't bring more than its superclass).
parent fd964450
......@@ -2,27 +2,18 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>69 71 356 240 0 0 1280 778 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>220 380 438 44 0 0 1280 778 </string>
<key>915</key>
<string>69 316 187 285 0 0 1280 778 </string>
</dict>
<key>IBFramework Version</key>
<string>489.0</string>
<string>667</string>
<key>IBLastKnownRelativeProjectPath</key>
<string>../../vlc.xcodeproj</string>
<key>IBOldestOS</key>
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
<integer>21</integer>
<integer>2416</integer>
<integer>2417</integer>
<integer>915</integer>
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>9E17</string>
......
......@@ -99,6 +99,7 @@
@interface VLCEmbeddedVoutView : VLCVoutView
{
BOOL b_used;
id o_embeddedwindow;
}
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
......@@ -109,17 +110,6 @@
@end
/*****************************************************************************
* VLCDetachedEmbeddedView interface
*****************************************************************************/
@interface VLCDetachedEmbeddedVoutView : VLCEmbeddedVoutView
{
id o_embeddedwindow;
}
@end
/*****************************************************************************
* VLCVoutWindow interface
*****************************************************************************/
......
......@@ -819,7 +819,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[o_window setLevel: NSStatusWindowLevel];
}
[o_window setAcceptsMouseMovedEvents: TRUE];
return b_return;
}
......@@ -884,11 +883,19 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
@implementation VLCEmbeddedVoutView
- (void)awakeFromNib
{
o_embeddedwindow = [self window];
}
- (id)initWithFrame: (NSRect)frameRect
{
[super initWithFrame: frameRect];
if(self = [super initWithFrame: frameRect])
{
b_used = NO;
[[[VLCMain sharedInstance] getEmbeddedList] addEmbeddedVout: self];
o_embeddedwindow = nil; /* Filled later on in -awakeFromNib */
}
return self;
}
......@@ -914,46 +921,6 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[view setFrameSize: [self frame].size];
}
return b_return;
}
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
}
- (void)setUsed: (BOOL)b_new_used
{
b_used = b_new_used;
}
- (BOOL)isUsed
{
return b_used;
}
- (void)closeVout
{
[super closeVout];
[o_window setAcceptsMouseMovedEvents: NO];
[[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
}
@end
@implementation VLCDetachedEmbeddedVoutView
- (void)awakeFromNib
{
o_embeddedwindow = [self window];
}
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
BOOL b_return = [super setVout: p_arg_vout subView: view frame: s_arg_frame showWindow: NO];
/* o_window needs to point to our o_embeddedwindow, super might have set it
* to the fullscreen window that o_embeddedwindow setups during fullscreen */
......@@ -983,9 +950,27 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[o_window unlockFullscreenAnimation];
}
return b_return;
}
- (BOOL)setVout: (vout_thread_t *) p_arg_vout subView: (NSView *) view
frame: (NSRect *) s_arg_frame
{
return [self setVout: p_arg_vout subView: view frame:s_arg_frame showWindow: YES];
}
- (void)setUsed: (BOOL)b_new_used
{
b_used = b_new_used;
}
- (BOOL)isUsed
{
return b_used;
}
- (void)closeVout
{
/* Don't close the window yet, wait a bit to see if a new input is poping up */
......@@ -995,6 +980,8 @@ int DeviceCallback( vlc_object_t *p_this, const char *psz_variable,
[o_window performSelector:@selector(orderOut:) withObject:nil afterDelay:1.5];
[super closeVout];
[o_window setAcceptsMouseMovedEvents: NO];
[[[VLCMain sharedInstance] getEmbeddedList] releaseEmbeddedVout: self];
}
- (void)enterFullscreen
......
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