if( o_value == nil )
{
- msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" );
+ /* Why is there a warning if that happens all the time and seems
+ * to be normal? Add an assert and fix it.
+ * msg_Warn( VLCIntf, "playlist item misses pointer value, adding one" ); */
o_value = [[NSValue valueWithPointer: p_return] retain];
}
return o_value;
if( p_item )
i_return = p_item->i_children;
}
- vlc_object_release( p_playlist );
+ pl_Release( VLCIntf );
- return (i_return > 0);
+ return (i_return >= 0);
}
/* retrieve the string values for the cells */
attempted_reload = NO;
- if( [[o_tc identifier] isEqualToString:@"1"] )
+ if( [[o_tc identifier] isEqualToString:@"name"] )
{
/* sanity check to prevent the NSString class from crashing */
char *psz_title = input_item_GetTitle( p_item->p_input );
else
{
char *psz_name = input_item_GetName( p_item->p_input );
- if( !EMPTY_STR( psz_name ) )
- {
+ if( psz_name )
o_value = [NSString stringWithUTF8String: psz_name];
- }
free( psz_name );
}
free( psz_title );
}
- else
+ else if( [[o_tc identifier] isEqualToString:@"artist"] )
{
char *psz_artist = input_item_GetArtist( p_item->p_input );
- if( [[o_tc identifier] isEqualToString:@"2"] && !EMPTY_STR( psz_artist ) )
- {
+ if( psz_artist )
o_value = [NSString stringWithUTF8String: psz_artist];
+ free( psz_artist );
+ }
+ else if( [[o_tc identifier] isEqualToString:@"duration"] )
+ {
+ char psz_duration[MSTRTIME_MAX_SIZE];
+ mtime_t dur = input_item_GetDuration( p_item->p_input );
+ if( dur != -1 )
+ {
+ secstotimestr( psz_duration, dur/1000000 );
+ o_value = [NSString stringWithUTF8String: psz_duration];
}
- else if( [[o_tc identifier] isEqualToString:@"3"] )
+ else
+ o_value = @"--:--";
+ }
+ else if( [[o_tc identifier] isEqualToString:@"status"] )
+ {
+ if( input_ItemHasErrorWhenReading( p_item->p_input ) )
{
- char psz_duration[MSTRTIME_MAX_SIZE];
- mtime_t dur = input_item_GetDuration( p_item->p_input );
- if( dur != -1 )
- {
- secstotimestr( psz_duration, dur/1000000 );
- o_value = [NSString stringWithUTF8String: psz_duration];
- }
- else
- {
- o_value = @"--:--";
- }
+ o_value = [NSImage imageWithWarningIcon];
}
- free( psz_artist );
}
return o_value;
}
return self;
}
+- (void)dealloc
+{
+ [o_nodes_array release];
+ [o_items_array release];
+ [super dealloc];
+}
+
- (void)awakeFromNib
{
playlist_t * p_playlist = pl_Yield( VLCIntf );
}
- /* update our info-panel to reflect the new item */
- [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input];
-
vlc_object_release( p_playlist );
}
int ret_v;
char *psz_name = NULL;
- playlist_item_t * p_item;
ret_v = intf_UserStringInput( p_playlist, _("New Node"),
_("Please enter a name for the new node."), &psz_name );
- if( ret_v != DIALOG_CANCELLED && psz_name && *psz_name )
- p_item = playlist_NodeCreate( p_playlist, psz_name,
+ PL_LOCK;
+ if( ret_v != DIALOG_CANCELLED && psz_name )
+ {
+ playlist_NodeCreate( p_playlist, psz_name,
p_playlist->p_local_category, 0, NULL );
+ }
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"),
+ playlist_NodeCreate( p_playlist, _("Empty Folder"),
p_playlist->p_local_category, 0, NULL );
}
+ PL_UNLOCK;
- if(! p_item )
- msg_Warn( VLCIntf, "node creation failed or cancelled by user" );
-
- vlc_object_release( p_playlist );
+ free( psz_name );
+ pl_Release( VLCIntf );
[ourPool release];
}