Cancel

[vlc] / modules / gui / macosx / playlist.m

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index a49ac72961fa2f18963d5b194bb9f40e12cacb44..31dfb8aa2f673bf72d2c291df25ad3ccce99e39f 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -171,7 +171,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
     [o_mi_play setTitle: _NS("Play")];
     [o_mi_delete setTitle: _NS("Delete")];
     [o_mi_selectall setTitle: _NS("Select All")];
-    [o_mi_info setTitle: _NS("Proprieties")];
+    [o_mi_info setTitle: _NS("Properties")];
 
     [[o_tc_name headerCell] setStringValue:_NS("Name")];
     [[o_tc_author headerCell] setStringValue:_NS("Author")];
@@ -404,7 +404,7 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
 
         vlc_mutex_lock( &p_playlist->object_lock );
         o_current_name = [NSString stringWithUTF8String: 
-            p_playlist->pp_items[i_current]->psz_name];
+            p_playlist->pp_items[i_current]->input.psz_name];
         o_current_author = [NSString stringWithUTF8String: 
             playlist_GetInfo(p_playlist, i_current ,_("General"),_("Author") )];
         vlc_mutex_unlock( &p_playlist->object_lock );
@@ -665,7 +665,10 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
     {
         vlc_mutex_lock( &p_playlist->object_lock );
         o_value = [NSString stringWithUTF8String: 
-            p_playlist->pp_items[i_row]->psz_name];
+            p_playlist->pp_items[i_row]->input.psz_name];
+        if( o_value == NULL )
+            o_value = [NSString stringWithCString: 
+                p_playlist->pp_items[i_row]->input.psz_name];
         vlc_mutex_unlock( &p_playlist->object_lock );
     }
     else if( [[o_tc identifier] isEqualToString:@"2"] )
@@ -673,6 +676,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
         vlc_mutex_lock( &p_playlist->object_lock );
         o_value = [NSString stringWithUTF8String: 
             playlist_GetInfo(p_playlist, i_row ,_("General"),_("Author") )];
+        if( o_value == NULL )
+            o_value = [NSString stringWithCString: 
+                playlist_GetInfo(p_playlist, i_row ,_("General"),_("Author") )];
         vlc_mutex_unlock( &p_playlist->object_lock );
     }
     else if( [[o_tc identifier] isEqualToString:@"3"] )