Commit ae7db4e9 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: fixed cocoa error complaining about missing window server connection...

macosx: fixed cocoa error complaining about missing window server connection and reduced number of ticks for the speed control
parent 83adfa3d
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -92,6 +92,8 @@ static int VolumeUpdated( vlc_object_t *, const char *, ...@@ -92,6 +92,8 @@ static int VolumeUpdated( vlc_object_t *, const char *,
*****************************************************************************/ *****************************************************************************/
int OpenIntf ( vlc_object_t *p_this ) int OpenIntf ( vlc_object_t *p_this )
{ {
NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
[VLCApplication sharedApplication];
intf_thread_t *p_intf = (intf_thread_t*) p_this; intf_thread_t *p_intf = (intf_thread_t*) p_this;
p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
...@@ -105,6 +107,7 @@ int OpenIntf ( vlc_object_t *p_this ) ...@@ -105,6 +107,7 @@ int OpenIntf ( vlc_object_t *p_this )
p_intf->pf_run = Run; p_intf->pf_run = Run;
p_intf->b_should_run_on_first_thread = true; p_intf->b_should_run_on_first_thread = true;
[o_pool release];
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -192,11 +195,10 @@ static void Run( intf_thread_t *p_intf ) ...@@ -192,11 +195,10 @@ static void Run( intf_thread_t *p_intf )
pthread_sigmask( SIG_UNBLOCK, &set, NULL ); pthread_sigmask( SIG_UNBLOCK, &set, NULL );
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
[VLCApplication sharedApplication];
o_appLock = [[NSLock alloc] init]; o_appLock = [[NSLock alloc] init];
[VLCApplication sharedApplication];
[[VLCMain sharedInstance] setIntf: p_intf]; [[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
...@@ -501,6 +503,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -501,6 +503,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_mainmenu = [[VLCMainMenu alloc] init]; o_mainmenu = [[VLCMainMenu alloc] init];
o_coreinteraction = [[VLCCoreInteraction alloc] init]; o_coreinteraction = [[VLCCoreInteraction alloc] init];
o_eyetv = [[VLCEyeTVController alloc] init]; o_eyetv = [[VLCEyeTVController alloc] init];
o_mainwindow = [[VLCMainWindow alloc] init];
/* announce our launch to a potential eyetv plugin */ /* announce our launch to a potential eyetv plugin */
[[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit" [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
...@@ -522,8 +525,13 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -522,8 +525,13 @@ static VLCMain *_o_sharedMainInstance = nil;
{ {
playlist_t *p_playlist; playlist_t *p_playlist;
vlc_value_t val; vlc_value_t val;
if( !p_intf ) return;
var_Create( p_intf, "intf-change", VLC_VAR_BOOL ); var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
/* Check if we already did this once. Opening the other nibs calls it too,
because VLCMain is the owner */
if( nib_main_loaded ) return;
[o_msgs_panel setExcludedFromWindowsMenu: YES]; [o_msgs_panel setExcludedFromWindowsMenu: YES];
[o_msgs_panel setDelegate: self]; [o_msgs_panel setDelegate: self];
...@@ -691,6 +699,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -691,6 +699,7 @@ static VLCMain *_o_sharedMainInstance = nil;
[o_embedded_list release]; [o_embedded_list release];
[o_coredialogs release]; [o_coredialogs release];
[o_eyetv release]; [o_eyetv release];
[o_mainwindow release];
/* unsubscribe from libvlc's debug messages */ /* unsubscribe from libvlc's debug messages */
msg_Unsubscribe( p_intf->p_sys->p_sub ); msg_Unsubscribe( p_intf->p_sys->p_sub );
......
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