Skip to content

V
vlc-2-2
Commit 01b16b83 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* don't mix old and new pl API

parent b9c4dee2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 7 deletions
modules/gui/macosx/playlist.m
View file @ 01b16b83
...@@ -257,13 +257,13 @@ NSLog( @"expandable" ); ...@@ -257,13 +257,13 @@ NSLog( @"expandable" );
if( [[o_tc identifier] isEqualToString:@"1"] ) if( [[o_tc identifier] isEqualToString:@"1"] )
{ {
/* sanity check to prevent the NSString class from crashing */ /* sanity check to prevent the NSString class from crashing */
if( p_item->input.psz_name != NULL ) if( p_item->p_input->psz_name != NULL )
{ {
o_value = [NSString stringWithUTF8String: o_value = [NSString stringWithUTF8String:
p_item->input.psz_name]; p_item->p_input->psz_name];
if( o_value == NULL ) if( o_value == NULL )
o_value = [NSString stringWithCString: o_value = [NSString stringWithCString:
p_item->input.psz_name]; p_item->p_input->psz_name];
} }
} }
else if( [[o_tc identifier] isEqualToString:@"2"] && p_item->p_input->p_meta && else if( [[o_tc identifier] isEqualToString:@"2"] && p_item->p_input->p_meta &&
...@@ -477,13 +477,9 @@ NSLog( @"expandable" ); ...@@ -477,13 +477,9 @@ NSLog( @"expandable" );
else else
{ {
if( playlist_IsEmpty( p_playlist ) ) if( playlist_IsEmpty( p_playlist ) )
{
[o_status_field setStringValue: _NS("No items in the playlist")]; [o_status_field setStringValue: _NS("No items in the playlist")];
}
else else
{
[o_status_field setStringValue: _NS("1 item in the playlist")]; [o_status_field setStringValue: _NS("1 item in the playlist")];
}
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment