Mac OS X gui: Small code cleanup. Remove NSLogs, avoid code redundancy.

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

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index ccc92c8eb1c1f9e3be85fd087b102edbb5320aaf..144f2682a4fb46331803ed9b1db8d3e7f609b89f 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -172,7 +172,7 @@
 
     if( i_return <= 0 )
         i_return = 0;
-NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name ); 
+
     return i_return;
 }
 
@@ -198,9 +198,7 @@ NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name );
     vlc_object_release( p_playlist );
 
     o_value = [o_outline_dict objectForKey:[NSString stringWithFormat: @"%p", p_return]];
-    #if 0
-    NSLog( @"%s", p_return->p_input->psz_name);
-    #endif
+
     if( o_value == nil )
     {
         o_value = [[NSValue valueWithPointer: p_return] retain];
@@ -231,11 +229,7 @@ NSLog( @"%d children for %s", i_return, p_item->p_input->psz_name );
     }
     vlc_object_release( p_playlist );
 
-NSLog( @"expandable" ); 
-    if( i_return <= 0 )
-        return NO;
-    else
-        return YES;
+    return (i_return > 0);
 }
 
 /* retrieve the string values for the cells */
@@ -251,7 +245,6 @@ NSLog( @"expandable" );
     {
         return( @"error");
     }
-//NSLog( @"values for %p", p_item ); 
     
     if( [[o_tc identifier] isEqualToString:@"1"] )
     {
@@ -1011,7 +1004,8 @@ NSLog( @"expandable" );
 
         /* Add the item */
         playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT,
-             i_position == -1 ? PLAYLIST_END : i_position + i_item, VLC_TRUE );
+             i_position == -1 ? PLAYLIST_END : i_position + i_item, VLC_TRUE,
+            VLC_FALSE );
 
         if( i_item == 0 && !b_enqueue )
         {
@@ -1052,7 +1046,7 @@ NSLog( @"expandable" );
        playlist_NodeAddInput( p_playlist, p_input, p_node,
                                       PLAYLIST_INSERT,
                                       i_position == -1 ?
-                                      PLAYLIST_END : i_position + i_item );
+                                      PLAYLIST_END : i_position + i_item, VLC_FALSE );
 
 
         if( i_item == 0 && !b_enqueue )
@@ -1341,15 +1335,19 @@ NSLog( @"expandable" );
     playlist_item_t * p_item;
     ret_v = intf_UserStringInput( p_playlist, _("New Node"), 
         _("Please enter a name for the new node."), &psz_name );
+
     if( psz_name != NULL && psz_name != "" )
         p_item = playlist_NodeCreate( p_playlist, psz_name, 
-                                            p_playlist->p_local_category );
-    else
+                                            p_playlist->p_local_category, 0 );
+    else if(! config_GetInt( p_playlist, "interact" ) )
+    {
+        /* in case that the interaction is disabled, just give it a bogus name */
         p_item = playlist_NodeCreate( p_playlist, _("Empty Folder"), 
-                                            p_playlist->p_local_category );
+                                            p_playlist->p_local_category, 0 );
+    }
 
     if(! p_item )
-        msg_Warn( VLCIntf, "node creation failed" );
+        msg_Warn( VLCIntf, "node creation failed or cancelled by user" );
 
     vlc_object_release( p_playlist );
     [ourPool release];