]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/intf.m
macosx: Fix crashlog opening.
[vlc] / modules / gui / macosx / intf.m
index 95024568d2bf39b1ba940d354ae8035ad7b56f71..a54c34c2dc48c2332eb5b2dcea2e51c5902b8bd3 100644 (file)
@@ -48,7 +48,6 @@
 #import "wizard.h"
 #import "extended.h"
 #import "bookmarks.h"
-#import "sfilters.h"
 #import "interaction.h"
 #import "embeddedwindow.h"
 #import "update.h"
@@ -106,7 +105,6 @@ int OpenIntf ( vlc_object_t *p_this )
 
     p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
 
-    p_intf->p_sys->o_sendport = [[NSPort port] retain];
     p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
     p_intf->pf_run = Run;
     p_intf->b_should_run_on_first_thread = true;
@@ -125,7 +123,6 @@ void CloseIntf ( vlc_object_t *p_this )
     
     msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
 
-    [p_intf->p_sys->o_sendport release];
     [p_intf->p_sys->o_pool release];
 
     free( p_intf->p_sys );
@@ -184,70 +181,6 @@ static void * ManageThread( void *user_data )
     return NULL;
 }
 
-int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
-{
-    int i_ret = 0;
-
-    //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
-    if( [target respondsToSelector: @selector(performSelectorOnMainThread:
-                                             withObject:waitUntilDone:)] )
-    {
-        [target performSelectorOnMainThread: sel
-                withObject: [NSValue valueWithPointer: p_arg]
-                waitUntilDone: NO];
-    }
-    else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
-    {
-        NSValue * o_v1;
-        NSValue * o_v2;
-        NSArray * o_array;
-        NSPort * o_recv_port;
-        NSInvocation * o_inv;
-        NSPortMessage * o_msg;
-        intf_thread_t * p_intf;
-        NSConditionLock * o_lock;
-        NSMethodSignature * o_sig;
-
-        id * val[] = { &o_lock, &o_v2 };
-
-        p_intf = (intf_thread_t *)VLCIntf;
-
-        o_recv_port = [[NSPort port] retain];
-        o_v1 = [NSValue valueWithPointer: val];
-        o_v2 = [NSValue valueWithPointer: p_arg];
-
-        o_sig = [target methodSignatureForSelector: sel];
-        o_inv = [NSInvocation invocationWithMethodSignature: o_sig];
-        [o_inv setArgument: &o_v1 atIndex: 2];
-        [o_inv setTarget: target];
-        [o_inv setSelector: sel];
-
-        o_array = [NSArray arrayWithObject:
-            [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]];
-        o_msg = [[NSPortMessage alloc]
-            initWithSendPort: p_intf->p_sys->o_sendport
-            receivePort: o_recv_port components: o_array];
-
-        o_lock = [[NSConditionLock alloc] initWithCondition: 0];
-        [o_msg sendBeforeDate: [NSDate distantPast]];
-        [o_lock lockWhenCondition: 1];
-        [o_lock unlock];
-        [o_lock release];
-
-        [o_msg release];
-        [o_recv_port release];
-    }
-    else
-    {
-        i_ret = 1;
-    }
-
-    //[o_pool release];
-
-    return( i_ret );
-}
-
 /*****************************************************************************
  * playlistChanged: Callback triggered by the intf-change playlist
  * variable, to let the intf update the playlist.
@@ -415,7 +348,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_embedded_list = [[VLCEmbeddedList alloc] init];
     o_interaction_list = [[VLCInteractionList alloc] init];
     o_info = [[VLCInfo alloc] init];
-    o_sfilters = nil;
 #ifdef UPDATE_CHECK
     o_update = [[VLCUpdate alloc] init];
 #endif
@@ -517,6 +449,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
 
     [self setSubmenusEnabled: FALSE];
+    [o_volumeslider setEnabled: YES];
     [self manageVolumeSlider];
     [o_window setDelegate: self];
  
@@ -532,7 +465,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     else
     {
         b_small_window = NO;
-        [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - 105 )];
+        [o_playlist_view setFrame: NSMakeRect( 0, 0, [o_window frame].size.width, [o_window frame].size.height - 95 )];
         [o_playlist_view setNeedsDisplay:YES];
         [o_playlist_view setAutoresizesSubviews: YES];
         [[o_window contentView] addSubview: o_playlist_view];
@@ -549,7 +482,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
     var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self);
 
-    vlc_object_release( p_playlist );
+    pl_Release( p_intf );
  
     var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
     var_AddCallback( p_intf, "interaction", InteractCallback, self );
@@ -772,11 +705,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_msg_lock = [[NSLock alloc] init];
     o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
 
-    [p_intf->p_sys->o_sendport setDelegate: self];
-    [[NSRunLoop currentRunLoop]
-        addPort: p_intf->p_sys->o_sendport
-        forMode: NSDefaultRunLoopMode];
-
     /* FIXME: don't poll */
     interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5
                                      target: self selector: @selector(manageIntf:)
@@ -1205,6 +1133,7 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (void)manage
 {
     playlist_t * p_playlist;
+    input_thread_t * p_input = NULL;
 
     /* new thread requires a new pool */
     NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
@@ -1226,24 +1155,25 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         vlc_mutex_lock( &p_intf->change_lock );
 
-        if( p_intf->p_sys->p_input == NULL )
+        if( !p_input )
         {
-            p_intf->p_sys->p_input = p_playlist->p_input;
+            p_input = playlist_CurrentInput( p_playlist );
 
             /* Refresh the interface */
-            if( p_intf->p_sys->p_input )
+            if( p_input )
             {
                 msg_Dbg( p_intf, "input has changed, refreshing interface" );
                 p_intf->p_sys->b_input_update = true;
             }
         }
-        else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead )
+        else if( !vlc_object_alive (p_input) || p_input->b_dead )
         {
             /* input stopped */
             p_intf->p_sys->b_intf_update = true;
             p_intf->p_sys->i_play_status = END_S;
             msg_Dbg( p_intf, "input has stopped, refreshing interface" );
-            p_intf->p_sys->p_input = NULL;
+            vlc_object_release( p_input );
+            p_input = NULL;
         }
 
         /* Manage volume status */
@@ -1256,9 +1186,17 @@ static VLCMain *_o_sharedMainInstance = nil;
     vlc_object_unlock( p_intf );
     [o_pool release];
 
+    if( p_input ) vlc_object_release( p_input );
+
+    var_DelCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+    var_DelCallback( p_playlist, "intf-change", PlaylistChanged, self );
+    var_DelCallback( p_playlist, "item-change", PlaylistChanged, self );
+    var_DelCallback( p_playlist, "item-append", PlaylistChanged, self );
+    var_DelCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+
     pthread_testcancel(); /* If we were cancelled stop here */
 
-    msg_Info( p_intf, "Killing the Mac OS X module" );
+    msg_Dbg( p_intf, "Killing the Mac OS X module" );
 
     /* We are dead, terminate */
     [NSApp performSelectorOnMainThread: @selector(terminate:) withObject:nil waitUntilDone:NO];
@@ -1276,6 +1214,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         p_intf->p_sys->b_current_title_update = true;
         p_intf->p_sys->b_intf_update = true;
         p_intf->p_sys->b_input_update = false;
+        [self setupMenus]; /* Make sure input menu is up to date */
     }
     if( p_intf->p_sys->b_intf_update )
     {
@@ -1304,7 +1243,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             //b_chapters = p_input->stream.i_area_nb > 1;
             vlc_object_release( p_input );
         }
-        vlc_object_release( p_playlist );
+        pl_Release( p_intf );
 
         [o_btn_stop setEnabled: b_input];
         [o_btn_ff setEnabled: b_seekable];
@@ -1348,32 +1287,26 @@ static VLCMain *_o_sharedMainInstance = nil;
         p_intf->p_sys->b_intf_show = false;
     }
 
-    p_playlist = pl_Yield( p_intf );
-    p_input = vlc_object_find( p_playlist, VLC_OBJECT_INPUT,
-                               FIND_CHILD );
-
-    if( p_input && !p_input->b_die )
+    p_input = pl_CurrentInput( p_intf );
+    if( p_input && vlc_object_alive (p_input) )
     {
         vlc_value_t val;
 
         if( p_intf->p_sys->b_current_title_update )
         {
-            NSString *o_temp;
+            NSString *aString;
+            input_item_t * p_item = input_GetItem( p_input );
+            char * name = input_item_GetNowPlaying( p_item );
 
-            if( p_playlist->status.p_item == NULL )
-            {
-                vlc_object_release( p_input );
-                vlc_object_release( p_playlist );
-                return;
-            }
-            if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) )
-                o_temp = [NSString stringWithUTF8String: 
-                    input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )];
-            else
-                o_temp = [NSString stringWithUTF8String:
-                    p_playlist->status.p_item->p_input->psz_name];
-            [self setScrollField: o_temp stopAfter:-1];
-            [[[self getControls] getFSPanel] setStreamTitle: o_temp];
+            if( !name )
+                name = input_item_GetName( p_item );
+
+            aString = [NSString stringWithUTF8String:name];
+
+            free(name);
+
+            [self setScrollField: aString stopAfter:-1];
+            [[[self getControls] getFSPanel] setStreamTitle: aString];
 
             [[o_controls getVoutView] updateTitle];
  
@@ -1403,21 +1336,6 @@ static VLCMain *_o_sharedMainInstance = nil;
             [o_embedded_window setTime: o_time position: f_updated];
         }
 
-        if( p_intf->p_sys->b_volume_update )
-        {
-            NSString *o_text;
-            int i_volume_step = 0;
-            o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
-            if( i_lastShownVolume != -1 )
-            [self setScrollField:o_text stopAfter:1000000];
-            i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
-            [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
-            [o_volumeslider setEnabled: TRUE];
-            [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
-            p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
-            p_intf->p_sys->b_volume_update = FALSE;
-        }
-
         /* Manage Playing status */
         var_Get( p_input, "state", &val );
         if( p_intf->p_sys->i_play_status != val.i_int )
@@ -1428,16 +1346,34 @@ static VLCMain *_o_sharedMainInstance = nil;
         }
         vlc_object_release( p_input );
     }
+    else if( p_input )
+    {
+        vlc_object_release( p_input );
+    }
     else
     {
         p_intf->p_sys->i_play_status = END_S;
-        p_intf->p_sys->b_playlist_update = true;
         [self playStatusUpdated: p_intf->p_sys->i_play_status];
         [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
         [self setSubmenusEnabled: FALSE];
     }
-    vlc_object_release( p_playlist );
 
+    if( p_intf->p_sys->b_volume_update )
+    {
+        NSString *o_text;
+        int i_volume_step = 0;
+        o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
+        if( i_lastShownVolume != -1 )
+        [self setScrollField:o_text stopAfter:1000000];
+        i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
+        [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
+        [o_volumeslider setEnabled: TRUE];
+        [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
+        p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
+        p_intf->p_sys->b_volume_update = FALSE;
+    }
+
+end:
     [self updateMessageArray];
 
     if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
@@ -1453,10 +1389,9 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (void)setupMenus
 {
     playlist_t * p_playlist = pl_Yield( p_intf );
-    input_thread_t * p_input = p_playlist->p_input;
+    input_thread_t * p_input = playlist_CurrentInput( p_playlist );
     if( p_input != NULL )
     {
-        vlc_object_yield( p_input );
         [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
             var: "program" selector: @selector(toggleVar:)];
 
@@ -1525,7 +1460,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         }
         vlc_object_release( p_input );
     }
-    vlc_object_release( p_playlist );
+    pl_Release( p_intf );
 }
 
 - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
@@ -1567,13 +1502,12 @@ static VLCMain *_o_sharedMainInstance = nil;
 - (void)resetScrollField
 {
     playlist_t * p_playlist = pl_Yield( p_intf );
-    input_thread_t * p_input = p_playlist->p_input;
+    input_thread_t * p_input = playlist_CurrentInput( p_playlist );
 
     i_end_scroll = -1;
-    if( p_input && !p_input->b_die )
+    if( p_input && vlc_object_alive (p_input) )
     {
         NSString *o_temp;
-        vlc_object_yield( p_input );
         if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) )
             o_temp = [NSString stringWithUTF8String: 
                 input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )];
@@ -1583,10 +1517,10 @@ static VLCMain *_o_sharedMainInstance = nil;
         [self setScrollField: o_temp stopAfter:-1];
         [[[self getControls] getFSPanel] setStreamTitle: o_temp];
         vlc_object_release( p_input );
-        vlc_object_release( p_playlist );
+        pl_Release( p_intf );
         return;
     }
-    vlc_object_release( p_playlist );
+    pl_Release( p_intf );
     [self setScrollField: _NS("VLC media player") stopAfter:-1];
 }
 
@@ -1726,14 +1660,13 @@ static VLCMain *_o_sharedMainInstance = nil;
             return;
     }
     p_playlist = pl_Yield( p_intf );
-    p_input = p_playlist->p_input;
+    p_input = playlist_CurrentInput( p_playlist );
     if( p_input != NULL )
     {
         vlc_value_t time;
         vlc_value_t pos;
         NSString * o_time;
         char psz_time[MSTRTIME_MAX_SIZE];
-        vlc_object_yield( p_input );
 
         pos.f_float = f_updated / 10000.;
         var_Set( p_input, "position", pos );
@@ -1747,7 +1680,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         [o_embedded_window setTime: o_time position: f_updated];
         vlc_object_release( p_input );
     }
-    vlc_object_release( p_playlist );
+    pl_Release( p_intf );
 }
 
 - (void)applicationWillTerminate:(NSNotification *)notification
@@ -1815,9 +1748,12 @@ static VLCMain *_o_sharedMainInstance = nil;
     if( nib_bookmarks_loaded )
         [o_bookmarks release];
 
-    if( nib_info_loaded )
+    if( o_info )
+    {
+        [o_info stopTimers];
         [o_info release];
-    
+    }
+
     if( nib_wizard_loaded )
         [o_wizard release];
  
@@ -1838,6 +1774,12 @@ static VLCMain *_o_sharedMainInstance = nil;
     /* write cached user defaults to disk */
     [[NSUserDefaults standardUserDefaults] synchronize];
 
+    /* Kill the playlist, so that it doesn't accept new request
+     * such as the play request from vlc.c (we are a blocking interface). */
+    p_playlist = pl_Yield( p_intf );
+    vlc_object_kill( p_playlist );
+    pl_Release( p_intf );
+
     vlc_object_kill( p_intf->p_libvlc );
 
     /* Go back to Run() and make libvlc exit properly */
@@ -1943,22 +1885,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     [o_extended showPanel];
 }
 
-- (IBAction)showSFilters:(id)sender
-{
-    if( o_sfilters == nil )
-    {
-        o_sfilters = [[VLCsFilters alloc] init];
-    }
-    if( !nib_sfilters_loaded )
-    {
-        nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
-        [o_sfilters initStrings];
-        [o_sfilters showAsPanel];
-    } else {
-        [o_sfilters showAsPanel];
-    }
-}
-
 - (IBAction)showBookmarks:(id)sender
 {
     /* we need the wizard-nib for the bookmarks's extract functionality */
@@ -1999,12 +1925,7 @@ static VLCMain *_o_sharedMainInstance = nil;
         o_prefs= [[VLCPrefs alloc] init];
     }
 
-    if( sender == o_mi_sprefs )
-    {
-        [o_sprefs showSimplePrefs];
-    }
-    else
-        [o_prefs showPrefs];
+    [o_sprefs showSimplePrefs];
 }
 
 - (IBAction)checkForUpdate:(id)sender
@@ -2070,14 +1991,43 @@ static VLCMain *_o_sharedMainInstance = nil;
 
 - (IBAction)openCrashLog:(id)sender
 {
-    NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
-                                    stringByExpandingTildeInPath];
+    NSString * crashReporter = [@"~/Library/Logs/CrashReporter" stringByExpandingTildeInPath];
+    NSDirectoryEnumerator *direnum = [[NSFileManager defaultManager] enumeratorAtPath:crashReporter];
+    NSString *fname;
+    BOOL found = NO;
+    NSString * latestLog = nil;
+    int year = 0;
+    int month = 0;
+    int day = 0;
+    int hours = 0;
 
+    while (fname = [direnum nextObject])
+    {
+        [direnum skipDescendents];
+        if([fname hasPrefix:@"VLC"] && [fname hasSuffix:@"crash"])
+        {
+            NSArray * compo = [fname componentsSeparatedByString:@"_"];
+            if( [compo count] < 3 ) { found = NO; break; }
+            compo = [[compo objectAtIndex:1] componentsSeparatedByString:@"-"];
+            if( [compo count] < 4 ) { found = NO; break; }
+            if( year  < [[compo objectAtIndex:0] intValue] &&
+                month < [[compo objectAtIndex:1] intValue] &&
+                day   < [[compo objectAtIndex:2] intValue] &&
+                hours < [[compo objectAtIndex:3] intValue] )
+            {
+                year  = [[compo objectAtIndex:0] intValue];
+                month = [[compo objectAtIndex:1] intValue];
+                day   = [[compo objectAtIndex:2] intValue];
+                hours = [[compo objectAtIndex:3] intValue];
+                latestLog = [NSString stringWithFormat:@"%@/%@",crashReporter, fname];
+                found = YES;
+            }
+        }
+    }
 
-    if( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
+    if( found && latestLog && [[NSFileManager defaultManager] fileExistsAtPath: latestLog ] )
     {
-        [[NSWorkspace sharedWorkspace] openFile: o_path
-                                    withApplication: @"Console"];
+        [[NSWorkspace sharedWorkspace] openFile: latestLog withApplication: @"Console"];
     }
     else
     {
@@ -2234,7 +2184,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     {
         /* If large and coming from small then show */
         [o_playlist_view setAutoresizesSubviews: YES];
-        [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - [o_window minSize].height - 10 )];
+        [o_playlist_view setFrame: NSMakeRect( 0, 0, [o_window frame].size.width, [o_window frame].size.height - [o_window minSize].height )];
         [o_playlist_view setNeedsDisplay:YES];
         [[o_window contentView] addSubview: o_playlist_view];
         b_small_window = NO;