From: Pierre d'Herbemont <pdherbemont@videolan.org>
Date: Sun, 13 Jul 2008 20:07:46 +0000 (+0200)
Subject: macosx: Don't use playlist_NodeAddInput() it's deprecated. Fix #1705.
X-Git-Tag: 0.9.0-test2~11
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f31cfbac27544902e0603b54b346b3a62728e349;p=vlc

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

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index c81aaff39b..0b0d130cb6 100644
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -1038,17 +1038,16 @@
         /* Get the item */
         o_one_item = [o_array objectAtIndex: i_item];
         p_input = [self createItem: o_one_item];
-        if( !p_input )
-        {
-            continue;
-        }
+
+        if( !p_input ) continue;
 
         /* Add the item */
-        /* FIXME: playlist_NodeAddInput() can fail */
-       playlist_NodeAddInput( p_playlist, p_input, p_node,
+        /* FIXME: playlist_BothAddInput() can fail */
+       playlist_BothAddInput( p_playlist, p_input, p_node,
                                       PLAYLIST_INSERT,
                                       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 )
@@ -1615,13 +1614,13 @@
 
         if ( item == nil )
         {
-            [self appendArray: o_array atPos: index enqueue: YES];
+            [self appendArray:o_array atPos:index enqueue: YES];
         }
         else
         {
             assert( p_node->i_children != -1 );
-            [self appendNodeArray: o_array inNode: p_node
-                atPos: index enqueue: YES];
+            [self appendNodeArray:o_array inNode: p_node
+                atPos:index enqueue:YES];
         }
         vlc_object_release( p_playlist );
         return YES;