Add a function to get the Title and fallback to the name if the title is empty.

[vlc] / src / playlist / sort.c

diff --git a/src/playlist/sort.c b/src/playlist/sort.c
index e9d1e43482f2b8ca16e8a047aad2b45718e6fb39..7b79606685442e68a80dd8d9ae8b401b38aec748 100644 (file)
--- a/src/playlist/sort.c
+++ b/src/playlist/sort.c
@@ -119,10 +119,8 @@ static int playlist_cmp(const void *first, const void *second)
 {
 
 #define META_STRCASECMP_NAME( ) { \
-    char *psz_i = input_item_GetTitle( (*(playlist_item_t **)first)->p_input ); \
-    char *psz_ismall = input_item_GetTitle( (*(playlist_item_t **)second)->p_input ); \
-    if(EMPTY_STR(psz_i)) {free(psz_i); psz_i = input_item_GetName( (*(playlist_item_t **)first)->p_input ); }\
-    if(EMPTY_STR(psz_ismall)) {free(psz_ismall); psz_ismall = input_item_GetName( (*(playlist_item_t **)second)->p_input ); }\
+    char *psz_i = input_item_GetTitleFbName( (*(playlist_item_t **)first)->p_input ); \
+    char *psz_ismall = input_item_GetTitleFbName( (*(playlist_item_t **)second)->p_input ); \
     if( psz_i != NULL && psz_ismall != NULL ) i_test = strcasecmp( psz_i, psz_ismall ); \
     else if ( psz_i == NULL && psz_ismall != NULL ) i_test = 1; \
     else if ( psz_ismall == NULL && psz_i != NULL ) i_test = -1; \