X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fplaylist.m;h=30daeb0dfb52bddb4f60b473c8b4fb7439f02cec;hb=875cd3dde62952d9fd9f3ec684a87fd5ea0732c6;hp=69d9fbbc90cf73323070621febd40c21badb5b0e;hpb=bfef7653c3e70dff098ac61b900a5c9b860542a7;p=vlc diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 69d9fbbc90..30daeb0dfb 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -189,7 +189,9 @@ 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; @@ -215,9 +217,9 @@ 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 */ @@ -256,7 +258,7 @@ 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 ); @@ -267,36 +269,37 @@ 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; } @@ -349,6 +352,13 @@ return self; } +- (void)dealloc +{ + [o_nodes_array release]; + [o_items_array release]; + [super dealloc]; +} + - (void)awakeFromNib { playlist_t * p_playlist = pl_Yield( VLCIntf ); @@ -478,6 +488,8 @@ [o_status_field setStringValue: _NS("1 item")]; } vlc_object_release( p_playlist ); + + [self outlineViewSelectionDidChange: nil]; } - (void)playModeUpdated @@ -551,23 +563,14 @@ } - /* update our info-panel to reflect the new item */ - [[[VLCMain sharedInstance] getInfo] updatePanelWithItem:p_item->p_input]; - vlc_object_release( p_playlist ); } /* Check if p_item is a child of p_node recursively. We need to check the item existence first since OSX sometimes tries to redraw items that have been - deleted. We don't do it when not required since this verification takes + deleted. We don't do it when not required since this verification takes quite a long time on big playlists (yes, pretty hacky). */ -- (BOOL)isItem: (playlist_item_t *)p_item - inNode: (playlist_item_t *)p_node - checkItemExistence:(BOOL)b_check -{ - [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO]; -} - (BOOL)isItem: (playlist_item_t *)p_item inNode: (playlist_item_t *)p_node @@ -629,6 +632,13 @@ return NO; } +- (BOOL)isItem: (playlist_item_t *)p_item + inNode: (playlist_item_t *)p_node + checkItemExistence:(BOOL)b_check +{ + [self isItem:p_item inNode:p_node checkItemExistence:b_check locked:NO]; +} + /* This method is usefull for instance to remove the selected children of an already selected node */ - (void)removeItemsFrom:(id)o_items ifChildrenOf:(id)o_nodes @@ -654,7 +664,6 @@ } } } - } - (IBAction)savePlaylist:(id)sender @@ -748,7 +757,7 @@ p_item = NULL; } } - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, false, p_node, p_item ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Unlocked, p_node, p_item ); } vlc_object_release( p_playlist ); } @@ -851,12 +860,12 @@ ((playlist_item_t *)[o_item pointerValue]) checkItemExistence: NO locked:YES] == YES ) // if current item is in selected node and is playing then stop playlist - playlist_Stop( p_playlist ); + playlist_Control(p_playlist, PLAYLIST_STOP, pl_Locked ); playlist_NodeDelete( p_playlist, p_item, true, false ); } else - playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, true ); + playlist_DeleteFromInput( p_playlist, p_item->p_input->i_id, pl_Locked ); } PL_UNLOCK; @@ -1017,13 +1026,13 @@ playlist_AddInput( p_playlist, p_input, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, true, - true ); + pl_Locked ); if( i_item == 0 && !b_enqueue ) { playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input, true ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item ); } vlc_gc_decref( p_input ); } @@ -1051,19 +1060,21 @@ /* Add the item */ /* FIXME: playlist_BothAddInput() can fail */ - playlist_BothAddInput( p_playlist, p_input, p_node, + PL_LOCK; + playlist_BothAddInput( p_playlist, p_input, p_node, PLAYLIST_INSERT, i_position == -1 ? PLAYLIST_END : i_position + i_item, - NULL, NULL, false ); + NULL, NULL, pl_Locked ); if( i_item == 0 && !b_enqueue ) { playlist_item_t *p_item; - p_item = playlist_ItemGetByInput( p_playlist, p_input, true ); - playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, true, NULL, p_item ); + p_item = playlist_ItemGetByInput( p_playlist, p_input, pl_Locked ); + playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, pl_Locked, NULL, p_item ); } + PL_UNLOCK; vlc_gc_decref( p_input ); } [self playlistUpdated];