Skip to content

V
vlc-2-2
Commit f31cfbac authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Don't use playlist_NodeAddInput() it's deprecated. Fix #1705.

parent 2335fa6b
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
modules/gui/macosx/playlist.m
View file @ f31cfbac
...@@ -1038,17 +1038,16 @@ ...@@ -1038,17 +1038,16 @@
/* Get the item */ /* Get the item */
o_one_item = [o_array objectAtIndex: i_item]; o_one_item = [o_array objectAtIndex: i_item];
p_input = [self createItem: o_one_item]; p_input = [self createItem: o_one_item];
if( !p_input )
{ if( !p_input ) continue;
continue;
}
/* Add the item */ /* Add the item */
/* FIXME: playlist_NodeAddInput() can fail */ /* FIXME: playlist_BothAddInput() can fail */
playlist_NodeAddInput( p_playlist, p_input, p_node, playlist_BothAddInput( p_playlist, p_input, p_node,
PLAYLIST_INSERT, PLAYLIST_INSERT,
i_position == -1 ? i_position == -1 ?
PLAYLIST_END : i_position + i_item, false ); PLAYLIST_END : i_position + i_item,
NULL, NULL, false );
if( i_item == 0 && !b_enqueue ) if( i_item == 0 && !b_enqueue )
...@@ -1615,13 +1614,13 @@ ...@@ -1615,13 +1614,13 @@
if ( item == nil ) if ( item == nil )
{ {
[self appendArray: o_array atPos: index enqueue: YES]; [self appendArray:o_array atPos:index enqueue: YES];
} }
else else
{ {
assert( p_node->i_children != -1 ); assert( p_node->i_children != -1 );
[self appendNodeArray: o_array inNode: p_node [self appendNodeArray:o_array inNode: p_node
atPos: index enqueue: YES]; atPos:index enqueue:YES];
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return YES; return YES;
......
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