From 0601a14dc479ef6a0d0c3e488158e2fc5c899b5f Mon Sep 17 00:00:00 2001 From: Marvin Scholz Date: Tue, 30 Nov 2021 21:25:33 +0100 Subject: [PATCH] macosx: move playlist sorting into separate function --- modules/gui/macosx/VLCPLModel.m | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m index 2fbea38d15..deeade7336 100644 --- a/modules/gui/macosx/VLCPLModel.m +++ b/modules/gui/macosx/VLCPLModel.m @@ -425,6 +425,22 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var, #pragma mark - #pragma mark Sorting / Searching +- (void)sortPlaylistBy:(int)mode withOrder:(int)order +{ + PL_LOCK; + playlist_item_t *p_root = playlist_ItemGetById(p_playlist, [_rootItem plItemId]); + if (!p_root) { + PL_UNLOCK; + return; + } + + playlist_RecursiveNodeSort(p_playlist, p_root, mode, order); + + [self rebuildVLCPLItem:_rootItem]; + [_outlineView reloadData]; + PL_UNLOCK; +} + - (void)sortForColumn:(NSString *)o_column withMode:(int)i_mode { int i_column = 0; @@ -447,18 +463,7 @@ static int VolumeUpdated(vlc_object_t *p_this, const char *psz_var, else return; - PL_LOCK; - playlist_item_t *p_root = playlist_ItemGetById(p_playlist, [_rootItem plItemId]); - if (!p_root) { - PL_UNLOCK; - return; - } - - playlist_RecursiveNodeSort(p_playlist, p_root, i_column, i_mode); - - [self rebuildVLCPLItem:_rootItem]; - [_outlineView reloadData]; - PL_UNLOCK; + [self sortPlaylistBy:i_column withOrder:i_mode]; } - (void)searchUpdate:(NSString *)o_search