X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=aa529071f5f1ab0785d6094a4fbccbca3b063e8f;hb=d6fd7e4227ae722e6e2a52f0db1054ab7d731ae5;hp=639cf2786f7d5d1c114a5056612fe46126ce1e64;hpb=560016e367f498eccd4559a6c939895ef9ffbe26;p=vlc

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 639cf2786f..aa529071f5 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -481,7 +481,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 );
@@ -1132,6 +1132,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];
@@ -1153,25 +1154,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 = playlist_CurrentInput( p_playlist );
+            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( !vlc_object_alive (p_intf->p_sys->p_input) || 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" );
-            vlc_object_release( p_intf->p_sys->p_input );
-            p_intf->p_sys->p_input = NULL;
+            vlc_object_release( p_input );
+            p_input = NULL;
         }
 
         /* Manage volume status */
@@ -1184,6 +1185,8 @@ 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 );
@@ -1238,7 +1241,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];
@@ -1365,7 +1368,6 @@ static VLCMain *_o_sharedMainInstance = nil;
     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];
@@ -1388,10 +1390,9 @@ end:
 - (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:)];
 
@@ -1460,7 +1461,7 @@ end:
         }
         vlc_object_release( p_input );
     }
-    vlc_object_release( p_playlist );
+    pl_Release( p_intf );
 }
 
 - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
@@ -1502,13 +1503,12 @@ end:
 - (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 && 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 )];
@@ -1518,10 +1518,10 @@ end:
         [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];
 }
 
@@ -1661,14 +1661,13 @@ end:
             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 );
@@ -1682,7 +1681,7 @@ end:
         [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
@@ -1773,6 +1772,12 @@ end:
     /* 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 */
@@ -1918,12 +1923,7 @@ end:
         o_prefs= [[VLCPrefs alloc] init];
     }
 
-    if( sender == o_mi_sprefs )
-    {
-        [o_sprefs showSimplePrefs];
-    }
-    else
-        [o_prefs showPrefs];
+    [o_sprefs showSimplePrefs];
 }
 
 - (IBAction)checkForUpdate:(id)sender