Changeset 06ecc0b06606d780410b41770840c4eeb6032135

Timestamp:

15/12/05 02:44:00 (3 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1134611040 +0000

git-parent:

[d91bba21e9d6763ed8dd8eb643b5116b3ba50c0b]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1134611040 +0000

Message:

* - This should fix the "crash upon quit" issue with VLC Mac OS X.

• It should also no longer crash if you select macosx as an extraintf. This is not allowed. It is the cause of the NSDictionary crash reported often in the forums. Notice however that if you have selected a primary interface that is not macosx, you might end up with a "blank application" forcing you to reset the preferences manually (your fault for mocking with them in the first place).
  
• Should fix clivlc mode. (this mode allows you to run VLC on OSX while no user is logged in, in the GUI).
  

Thanks to Jean-Michel Vallat for kicking my ass. :D

Files:

• modules/gui/macosx/intf.m (modified) (3 diffs)
• src/interface/interface.c (modified) (5 diffs)

modules/gui/macosx/intf.m

@@ -807 +807 @@
-- (void)manage
-{
-    NSDate * o_sleep_date;
-    playlist_t * p_playlist;
-
@@ -862 +861 @@
-
-        vlc_mutex_unlock( &p_intf->change_lock );
-
-
-
-
-
-
+
+
-    [o_pool release];
-}
@@ -1435 +1430 @@
-
-    p_intf->b_die = VLC_TRUE;
-    [NSApp stop:NULL];
-}
-

src/interface/interface.c

@@ -67 +67 @@
-@interface VLCApplication : NSApplication
-{
-
+
+
+
+
-
-@end
@@ -158 +161 @@
-    }
-
-module
+vlc
-                                    "clivlc", 6) )
-    {
-        o_pool = [[NSAutoreleasePool alloc] init];
-        [VLCApplication sharedApplication];
+        [NSApp setVLC: p_intf->p_vlc];
-    }
-
@@ -176 +180 @@
-    {
-        /* Run the interface in a separate thread */
+        if( !strcmp( p_intf->p_module->psz_object_name, "macosx" ) )
+        {
+            msg_Err( p_intf, "You cannot run the MacOS X module as an extrainterface. Please read the README.MacOSX.rtf file");
+            return VLC_EGENERIC;
+        }
-        if( vlc_thread_create( p_intf, "interface", RunInterface,
-                               VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
@@ -447 +456 @@
-@implementation VLCApplication 
-
+- (void)setVLC: (vlc_t *) p_vlc
+{
+    o_vlc = p_vlc;
+}
+
-- (void)stop: (id)sender
-{
@@ -466 +480 @@
-- (void)terminate: (id)sender
-{
-
-
-
+
-}
-