Commit 988ba5e8 authored by David Fuhrmann's avatar David Fuhrmann

macosx: set VLCMain as file owner for mainwindow and add outlets for window and playlist

Fixes playlist initialization.
parent 6ea4d015
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -105,7 +105,7 @@ struct intf_sys_t ...@@ -105,7 +105,7 @@ struct intf_sys_t
BOOL b_active_videoplayback; BOOL b_active_videoplayback;
BOOL b_nativeFullscreenMode; BOOL b_nativeFullscreenMode;
VLCMainWindow *o_mainwindow; /* VLCMainWindow */ IBOutlet VLCMainWindow *o_mainwindow; /* VLCMainWindow */
IBOutlet VLCControls * o_controls; /* VLCControls */ IBOutlet VLCControls * o_controls; /* VLCControls */
IBOutlet VLCPlaylist * o_playlist; /* VLCPlaylist */ IBOutlet VLCPlaylist * o_playlist; /* VLCPlaylist */
......
...@@ -752,9 +752,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -752,9 +752,7 @@ static VLCMain *_o_sharedMainInstance = nil;
items_at_launch = p_playlist->p_local_category->i_children; items_at_launch = p_playlist->p_local_category->i_children;
PL_UNLOCK; PL_UNLOCK;
[NSBundle loadNibNamed:@"MainWindow" owner: NSApp]; [NSBundle loadNibNamed:@"MainWindow" owner: self];
o_playlist = [[VLCPlaylist alloc] init];
o_mainwindow = [[VLCMainWindow alloc] init];
[o_mainwindow makeKeyAndOrderFront:nil]; [o_mainwindow makeKeyAndOrderFront:nil];
} }
...@@ -914,7 +912,6 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -914,7 +912,6 @@ static VLCMain *_o_sharedMainInstance = nil;
libvlc_Quit(p_intf->p_libvlc); libvlc_Quit(p_intf->p_libvlc);
[o_mainwindow release];
o_mainwindow = NULL; o_mainwindow = NULL;
[self setIntf:nil]; [self setIntf:nil];
......
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