cdda/info: fix memleaks.

[vlc] / src / playlist / sort.c

diff --git a/src/playlist/sort.c b/src/playlist/sort.c
index 7a2a03be6542e4217a1586cd0ff640926baaeaa3..e7c5f6e116b056080cc8d00c0a6486ed24a70d04 100644 (file)
--- a/src/playlist/sort.c
+++ b/src/playlist/sort.c
@@ -25,7 +25,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include "vlc_playlist.h"
 #include "playlist_internal.h"
 
@@ -90,7 +90,7 @@ static int playlist_ItemArraySort( playlist_t *p_playlist, int i_items,
     int i_position;
     playlist_item_t *p_temp;
     vlc_value_t val;
-    val.b_bool = VLC_TRUE;
+    val.b_bool = true;
     sort_mode = i_mode;
     sort_type = i_type;
 
@@ -162,7 +162,7 @@ static int playlist_cmp(const void *first, const void *second)
     free( psz_a ); \
     free( psz_b ); \
 }
-#define DO_META_SORT( node ) DO_META_SORT_ADV( node, VLC_FALSE )
+#define DO_META_SORT( node ) DO_META_SORT_ADV( node, false )
 
     int i_test = 0;
 
@@ -191,7 +191,7 @@ static int playlist_cmp(const void *first, const void *second)
         if( i_test == 0 )
             DO_META_SORT( Album );
         if( i_test == 0 )
-            DO_META_SORT_ADV( TrackNumber, VLC_TRUE );
+            DO_META_SORT_ADV( TrackNumber, true );
     }
     else if( sort_mode == SORT_GENRE )
     {
@@ -202,11 +202,11 @@ static int playlist_cmp(const void *first, const void *second)
         DO_META_SORT( Album );
         /* Sort by tracknumber if albums are the same */
         if( i_test == 0 )
-            DO_META_SORT_ADV( TrackNumber, VLC_TRUE );
+            DO_META_SORT_ADV( TrackNumber, true );
     }
     else if( sort_mode == SORT_TRACK_NUMBER )
     {
-        DO_META_SORT_ADV( TrackNumber, VLC_TRUE );
+        DO_META_SORT_ADV( TrackNumber, true );
     }
     else if( sort_mode == SORT_DESCRIPTION )
     {