* Fix some crashes because of new playlist core

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 545a64c0e6dcf0db67940be178caf467bd7f6715..d2cd62309d827cb8458a760d6b4ccb692d149dbb 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -867,18 +867,18 @@ static VLCMain *_o_sharedMainInstance = nil;
             {
                 return;
             }
-/*
+
             vlc_mutex_lock( &p_playlist->object_lock );
             o_temp = [NSString stringWithUTF8String:
-                p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
+                p_playlist->p_input.psz_name];
             if( o_temp == NULL )
                 o_temp = [NSString stringWithCString:
-                    p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
+                    p_playlist->p_input.psz_name];
             vlc_mutex_unlock( &p_playlist->object_lock );
             [o_scrollfield setStringValue: o_temp ];
-*/
 
-            /*p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+
+            p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
                                                     FIND_ANYWHERE );
             if( p_vout != NULL )
             {
@@ -893,7 +893,7 @@ static VLCMain *_o_sharedMainInstance = nil;
                     }
                 }
                 vlc_object_release( (vlc_object_t *)p_vout );
-            }*/
+            }
             [o_playlist updateRowSelection];
             vlc_object_release( p_playlist );
             p_intf->p_sys->b_current_title_update = FALSE;

diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index 72b360fbfadd17cd24083b002a81dce2bf4176d4..0b1267aa66282e79bff906ab025b93ad982e3a5f 100644 (file)
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -349,9 +349,8 @@
 
     vlc_mutex_lock( &p_playlist->object_lock );
     o_title = [NSMutableString stringWithUTF8String: 
-        p_playlist->pp_items[p_playlist->i_index]->input.psz_uri]; 
+        p_playlist->p_input.psz_uri]; 
     vlc_mutex_unlock( &p_playlist->object_lock );
-
     vlc_object_release( p_playlist );
 
     if( o_title != nil )