-

include/darwin_specific.h

@@ -2,7 +2,7 @@
  * darwin_specific.h: Darwin specific features
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: darwin_specific.h,v 1.8 2004/01/25 18:17:08 zorglub Exp $
+ * $Id$
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -20,4 +20,3 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
-

modules/gui/macosx/intf.m

@@ -70,8 +70,6 @@ int E_(OpenIntf) ( vlc_object_t *p_this )
     p_intf->b_play = VLC_TRUE;
     p_intf->pf_run = Run;
 
-    [[VLCMain sharedInstance] setIntf: p_intf];
-
     return( 0 );
 }
 
@@ -99,21 +97,24 @@ static void Run( intf_thread_t *p_intf )
      * fails to go to real-time priority with the first launched thread
      * (???) --Meuuh */
     vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+    [[VLCMain sharedInstance] setIntf: p_intf];
     [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
+    [NSApp run];
+    [[VLCMain sharedInstance] terminate];
 }
 
 int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
 {
     int i_ret = 0;
 
-    NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+    //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
 
     if( [target respondsToSelector: @selector(performSelectorOnMainThread:
                                              withObject:waitUntilDone:)] )
     {
         [target performSelectorOnMainThread: sel
                 withObject: [NSValue valueWithPointer: p_arg]
-                waitUntilDone: YES];
+                waitUntilDone: NO];
     }
     else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] ) 
     {
@@ -161,7 +162,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
         i_ret = 1;
     }
 
-    [o_pool release];
+    //[o_pool release];
 
     return( i_ret );
 }
@@ -290,7 +291,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (void)awakeFromNib
 {
     unsigned int i_key = 0;
-    intf_thread_t * p_intf = VLCIntf;
     playlist_t *p_playlist;
     vlc_value_t val;
 
@@ -527,7 +527,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 
     vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
 }
-/*
+
 - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
 {
     NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
@@ -536,7 +536,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             
     return( TRUE );
 }
-*/
+
 - (NSString *)localizedString:(char *)psz
 {
     NSString * o_str = nil;
@@ -637,7 +637,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     int i;
 
     val.i_int = 0;
-    p_hotkeys = VLCIntf->p_vlc->p_hotkeys;
+    p_hotkeys = p_intf->p_vlc->p_hotkeys;
 
     i_pressed_modifiers = [o_event modifierFlags];
 
@@ -658,7 +658,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         if( p_hotkeys[i].i_key == val.i_int )
         {
-            var_Set( VLCIntf->p_vlc, "key-pressed", val );
+            var_Set( p_intf->p_vlc, "key-pressed", val );
             return YES;
         }
     }
@@ -696,6 +696,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (void)manage
 {
     NSDate * o_sleep_date;
+    /* new thread requires a new pool */
     NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
 
     vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
@@ -809,7 +810,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             {
                 if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
                 {
-                    [o_vout_wnd updateTitle];
+                    ;//[o_vout_wnd updateTitle];
                 }
             }
             vlc_object_release( (vlc_object_t *)p_vout );
@@ -1134,7 +1135,6 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)timesliderUpdate:(id)sender
 {
-    intf_thread_t * p_intf;
     input_thread_t * p_input;
     float f_updated;
 

modules/gui/macosx/vout.h

@@ -74,29 +74,18 @@
 
 @end
 
-/*****************************************************************************
- * VLCVout interface
- *****************************************************************************/
-@interface VLCVout : NSObject
-{
-}
-
-- (void)createWindow:(NSValue *)o_value;
-- (void)destroyWindow:(NSValue *)o_value;
-
-@end
-
 /*****************************************************************************
  * vout_sys_t: MacOS X video output method descriptor
  *****************************************************************************/
 struct vout_sys_t
 {
-    int i_opengl;
-    
+    NSAutoreleasePool *o_pool;
     NSRect s_rect;
-    int b_pos_saved;
     VLCWindow * o_window;
 
+    int i_opengl;
+    int b_pos_saved;
+    
     vlc_bool_t b_mouse_moved;
     mtime_t i_time_mouse_last_moved;
 

src/interface/interface.c

@@ -60,6 +60,17 @@ static int SwitchIntfCallback( vlc_object_t *, char const *,
 static int AddIntfCallback( vlc_object_t *, char const *,
                             vlc_value_t , vlc_value_t , void * );
 
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication interface
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+}
+
+@end
+#endif
+
 /*****************************************************************************
  * intf_Create: prepare interface before main loop
  *****************************************************************************
@@ -131,6 +142,8 @@ intf_thread_t* __intf_Create( vlc_object_t *p_this, const char *psz_module )
 int intf_RunThread( intf_thread_t *p_intf )
 {
 #ifdef SYS_DARWIN
+    NSAutoreleasePool * o_pool;
+
     if( p_intf->b_block )
     {
         /* This is the primary intf */
@@ -143,28 +156,36 @@ int intf_RunThread( intf_thread_t *p_intf )
         }
     }
 
-    if( p_intf->b_block && !strncmp( p_intf->p_module->psz_shortname, "macosx" , 6 ) )
+    if( p_intf->b_block && strncmp( p_intf->p_module->psz_shortname, "clivlc", 6) )
     {
-	/* this is OSX, we are cheating :)
-           This is NOT I REPEAT NOT blocking since [NSApp run] is */
-	p_intf->b_block = VLC_FALSE;
-
-        RunInterface( p_intf );
-    	p_intf->b_block = VLC_TRUE;
+        o_pool = [[NSAutoreleasePool alloc] init];
+	[VLCApplication sharedApplication];
     }
-    else if( p_intf->b_block && !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) )
+
+    if( p_intf->b_block && ( !strncmp( p_intf->p_module->psz_shortname, "macosx" , 6 ) ||
+                             !strncmp( p_intf->p_vlc->psz_object_name, "clivlc", 6 ) ) )
     {
-        /* VLC OS X in cli mode ( no blocking [NSApp run] )
-           this is equal to running in normal non-OSX primary intf mode */
+        /* VLC in normal primary interface mode */
         RunInterface( p_intf );
         p_intf->b_die = VLC_TRUE;
     }
     else
     {
-        /* If anything else is the primary intf and we are not in cli mode,
-           then don't make it blocking ([NSApp run] will be blocking) 
-           but run it in a seperate thread. */
-        p_intf->b_block = VLC_FALSE;
+        /* Run the interface in a separate thread */
+        if( vlc_thread_create( p_intf, "interface", RunInterface,
+                               VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
+        {
+            msg_Err( p_intf, "cannot spawn interface thread" );
+            return VLC_EGENERIC;
+        }
+
+        if( p_intf->b_block )
+        {
+            /* VLC in primary interface mode with a working macosx vout */
+            [NSApp run];
+            p_intf->b_die = VLC_TRUE;
+        }
+    }
 #else
     if( p_intf->b_block )
     {
@@ -183,7 +204,6 @@ int intf_RunThread( intf_thread_t *p_intf )
     }
     else
     {
-#endif
         /* Run the interface in a separate thread */
         if( vlc_thread_create( p_intf, "interface", RunInterface,
                                VLC_THREAD_PRIORITY_LOW, VLC_FALSE ) )
@@ -192,6 +212,7 @@ int intf_RunThread( intf_thread_t *p_intf )
             return VLC_EGENERIC;
         }
     }
+#endif
 
     return VLC_SUCCESS;
 }
@@ -418,3 +439,37 @@ static int AddIntfCallback( vlc_object_t *p_this, char const *psz_cmd,
 
     return VLC_SUCCESS;
 }
+
+#ifdef SYS_DARWIN
+/*****************************************************************************
+ * VLCApplication implementation 
+ *****************************************************************************/
+@implementation VLCApplication 
+
+- (void)stop: (id)sender
+{
+    NSEvent *o_event;
+    NSAutoreleasePool *o_pool;
+    [super stop:sender];
+
+    o_pool = [[NSAutoreleasePool alloc] init];
+    /* send a dummy event to break out of the event loop */
+    o_event = [NSEvent mouseEventWithType: NSLeftMouseDown
+                location: NSMakePoint( 1, 1 ) modifierFlags: 0
+                timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber]
+                context: [NSGraphicsContext currentContext] eventNumber: 1
+                clickCount: 1 pressure: 0.0];
+    [NSApp postEvent: o_event atStart: YES];
+    [o_pool release];
+}
+
+- (void)terminate: (id)sender
+{
+    if( [NSApp isRunning] )
+        [NSApp stop:sender];
+    [super terminate: sender];
+}
+
+@end
+#endif
+

src/libvlc.h

@@ -1316,3 +1316,4 @@ static struct hotkey p_hotkeys[] =
     { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0},
     { NULL, 0, 0 }
 };
+

src/misc/darwin_specific.m

@@ -2,7 +2,7 @@
  * darwin_specific.m: Darwin specific features
  *****************************************************************************
  * Copyright (C) 2001-2004 VideoLAN
- * $Id: darwin_specific.m,v 1.18 2004/01/06 12:02:06 zorglub Exp $
+ * $Id$
  *
  * Authors: Sam Hocevar <sam@zoy.org>
  *          Christophe Massiot <massiot@via.ecp.fr>

src/video_output/video_output.c

@@ -1099,7 +1099,7 @@ static void ErrorThread( vout_thread_t *p_vout )
  * EndThread: thread destruction
  *****************************************************************************
  * This function is called when the thread ends after a sucessful
- * initialization. It frees all ressources allocated by InitThread.
+ * initialization. It frees all resources allocated by InitThread.
  *****************************************************************************/
 static void EndThread( vout_thread_t *p_vout )
 {

src/vlc.c

@@ -35,16 +35,9 @@
 #ifdef HAVE_TIME_H
 #   include <time.h>                                               /* time() */
 #endif
-#ifdef HAVE_STRINGS_H
-#   include <strings.h>                                         /* strncmp() */
-#endif
 
 #include <vlc/vlc.h>
 
-#ifdef SYS_DARWIN
-#include <Cocoa/Cocoa.h>
-#endif
-
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
@@ -52,46 +45,6 @@
 static void SigHandler  ( int i_signal );
 #endif
 
-#ifdef SYS_DARWIN
-/*****************************************************************************
- * VLCApplication interface
- *****************************************************************************/
-@interface VLCApplication : NSApplication
-{
-}
-
-@end
-
-/*****************************************************************************
- * VLCApplication implementation 
- *****************************************************************************/
-@implementation VLCApplication 
-
-- (void)stop: (id)sender
-{
-    NSEvent *o_event;
-    [super stop:sender];
-
-    /* send a dummy event to break out of the event loop */
-    o_event = [NSEvent mouseEventWithType: NSLeftMouseDown
-                location: NSMakePoint( 1, 1 ) modifierFlags: 0
-                timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber]
-                context: [NSGraphicsContext currentContext] eventNumber: 1
-                clickCount: 1 pressure: 0.0];
-    [NSApp postEvent: o_event atStart: YES];
-}
-
-- (void)terminate: (id)sender
-{
-    if( [NSApp isRunning] )
-        [NSApp stop:sender];
-    [super terminate: sender];
-}
-
-@end
-
-#endif /* SYS_DARWIN */
-
 /*****************************************************************************
  * main: parse command line, start interface and spawn threads.
  *****************************************************************************/
@@ -150,53 +103,14 @@ int main( int i_argc, char *ppsz_argv[] )
         return i_ret;
     }
 
-#ifdef HAVE_STRINGS_H
-    /* if first 3 chars of argv[0] are cli, then this is clivlc
-     * We detect this specifically for Mac OS X, so you can launch vlc
-     * from the commandline even if you are not logged in on the GUI */
-    if( i_argc > 0 )
-    {
-        char *psz_temp;
-        char *psz_program = psz_temp = ppsz_argv[0];
-        while( *psz_temp )
-        {
-            if( *psz_temp == '/' ) psz_program = ++psz_temp;
-            else ++psz_temp;
-        }
-        b_cli = !strncmp( psz_program, "cli", 3 );
-    }
-#endif
-
-#ifdef SYS_DARWIN
-    if( !b_cli )
-    {
-        [VLCApplication sharedApplication];
-    }
-
     i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
 
-    if( !b_cli )
-    {
-        /* This is a blocking call */
-        [NSApp run];
-    }
-#else
-    i_ret = VLC_AddIntf( 0, NULL, VLC_TRUE, VLC_TRUE );
-#endif /* SYS_DARWIN */
-
     /* Finish the threads */
     VLC_CleanUp( 0 );
 
     /* Destroy the libvlc structure */
     VLC_Destroy( 0 );
 
-#ifdef SYS_DARWIN
-    if( !b_cli )
-    {
-        [NSApp terminate:NULL];
-    }
-#endif /* SYS_DARWIN */
-
     return i_ret;
 }