core: move playlist to playlist_legacy

To make room for the new playlist.
This playlist_legacy will be removed once all modules are using the new
playlist.

include/vlc_playlist_legacy.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * vlc_playlist.h : Playlist functions
+ * vlc_playlist_legacy.h : Legacy playlist functions
  *****************************************************************************
  * Copyright (C) 1999-2004 VLC authors and VideoLAN
  * $Id$
@@ -21,8 +21,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef VLC_PLAYLIST_H_
-#define VLC_PLAYLIST_H_
+#ifndef VLC_PLAYLIST_LEGACY_H_
+#define VLC_PLAYLIST_LEGACY_H_
 
 # ifdef __cplusplus
 extern "C" {

lib/media.c

@@ -37,7 +37,7 @@
 #include <vlc_common.h>
 #include <vlc_input.h>
 #include <vlc_meta.h>
-#include <vlc_playlist.h> /* For the preparser */
+#include <vlc_playlist_legacy.h> /* For the preparser */
 #include <vlc_url.h>
 #include <vlc_thumbnailer.h>
 

lib/playlist.c

@@ -30,7 +30,7 @@
 
 #include <vlc/vlc.h>
 
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include <assert.h>
 

modules/control/dbus/dbus.c

@@ -57,7 +57,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_meta.h>
 #include <vlc_tick.h>

modules/control/dbus/dbus_player.c

@@ -31,7 +31,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 

modules/control/dbus/dbus_root.c

@@ -35,7 +35,7 @@
 #include <vlc_input.h>
 #include <vlc_vout.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include <unistd.h>
 #include <limits.h>

modules/control/dbus/dbus_tracklist.c

@@ -31,7 +31,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 
 #include <assert.h>

modules/control/gestures.c

@@ -34,7 +34,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <assert.h>
 

modules/control/hotkeys.c

@@ -39,7 +39,7 @@
 #include <vlc_mouse.h>
 #include <vlc_viewpoint.h>
 #include <vlc_vout_osd.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_actions.h>
 #include "math.h"
 

modules/control/motion.c

@@ -37,7 +37,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_vout.h>
 

modules/control/netsync.c

@@ -35,7 +35,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include <sys/types.h>
 #include <unistd.h>

modules/control/oldrc.c

@@ -42,7 +42,7 @@
 #include <vlc_input.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_actions.h>
 
 #include <sys/types.h>

modules/control/win_msg.c

@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_url.h> // FIXME: move URL generation to calling process
 

modules/gui/macosx/VLCCoreInteraction.m

@@ -26,7 +26,7 @@
 #import "VLCOpenWindowController.h"
 #import "VLCPlaylist.h"
 #import <math.h>
-#import <vlc_playlist.h>
+#import <vlc_playlist_legacy.h>
 #import <vlc_input.h>
 #import <vlc_actions.h>
 #import <vlc_aout.h>

modules/gui/macosx/VLCMain.h

@@ -30,7 +30,7 @@
 
 #import <vlc_common.h>
 #import <vlc_interface.h>
-#import <vlc_playlist.h>
+#import <vlc_playlist_legacy.h>
 #import <vlc_vout.h>
 #import <vlc_aout.h>
 #import <vlc_input.h>

modules/gui/macosx/VLCMainMenu.m

@@ -25,7 +25,7 @@
 #import "VLCMain.h"
 
 #import <vlc_common.h>
-#import <vlc_playlist.h>
+#import <vlc_playlist_legacy.h>
 #import <vlc_input.h>
 
 #import "VLCAboutWindowController.h"

modules/gui/macosx/VLCMainWindow.m

@@ -36,7 +36,7 @@
 #import "VLCPlaylist.h"
 #import "VLCSourceListItem.h"
 #import <math.h>
-#import <vlc_playlist.h>
+#import <vlc_playlist_legacy.h>
 #import <vlc_url.h>
 #import <vlc_strings.h>
 #import <vlc_services_discovery.h>

modules/gui/macosx/VLCPLItem.m

@@ -21,7 +21,7 @@
 
 #import "VLCPLItem.h"
 
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input_item.h>
 
 #pragma mark -

modules/gui/macosx/VLCPLModel.m

@@ -37,7 +37,7 @@
 #endif
 #include <assert.h>
 
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input_item.h>
 #include <vlc_input.h>
 #include <vlc_url.h>

modules/gui/macosx/VLCRendererItem.h

@@ -24,7 +24,7 @@
 #import <Foundation/Foundation.h>
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 /**
  \c VLCRendererItem is a simple wrapper class for libvlc’s

modules/gui/macosx/VLCStatusBarIcon.m

@@ -27,7 +27,7 @@
 #import "VLCMain.h"
 
 #import <vlc_common.h>
-#import <vlc_playlist.h>
+#import <vlc_playlist_legacy.h>
 #import <vlc_input.h>
 
 #import "CompatibilityFixes.h"

modules/gui/minimal_macosx/intf.m

@@ -34,7 +34,7 @@
 #endif
 
 #import <vlc_common.h>
-#import <vlc_playlist.h>
+#import <vlc_playlist_legacy.h>
 #import <vlc_interface.h>
 #import <vlc_vout_window.h>
 

modules/gui/ncurses.c

@@ -53,7 +53,7 @@
 #include <vlc_charset.h>
 #include <vlc_input.h>
 #include <vlc_es.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_meta.h>
 #include <vlc_fs.h>
 #include <vlc_url.h>

modules/gui/qt/components/playlist/playlist.hpp

@@ -32,7 +32,7 @@
 
 #include "qt.hpp"
 
-//#include <vlc_playlist.h>
+//#include <vlc_playlist_legacy.h>
 
 #include <QSplitter>
 

modules/gui/qt/components/playlist/playlist_model.hpp

@@ -30,7 +30,7 @@
 #endif
 
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include "vlc_model.hpp"
 #include "playlist_item.hpp"
 

modules/gui/qt/components/playlist/selector.cpp

@@ -44,7 +44,7 @@
 #include <QResource>
 #include <assert.h>
 
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_services_discovery.h>
 
 void SelectorActionButton::paintEvent( QPaintEvent *event )

modules/gui/qt/components/playlist/standardpanel.hpp

@@ -35,7 +35,7 @@
 #include <QWidget>
 #include <QModelIndexList>
 
-#include <vlc_playlist.h> /* playlist_item_t */
+#include <vlc_playlist_legacy.h> /* playlist_item_t */
 
 class QSignalMapper;
 class QWheelEvent;

modules/gui/qt/dialogs/epg.cpp

@@ -28,7 +28,7 @@
 
 #include "components/epg/EPGWidget.hpp"
 #include "components/epg/EPGItem.hpp"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include <QVBoxLayout>
 #include <QSplitter>

modules/gui/qt/qt.hpp

@@ -31,7 +31,7 @@
 
 #include <vlc_common.h>
 #include <vlc_interface.h> /* intf_thread_t */
-#include <vlc_playlist.h>  /* playlist_t */
+#include <vlc_playlist_legacy.h>  /* playlist_t */
 
 #include <qconfig.h>
 

modules/gui/skins2/commands/cmd_add_item.cpp

@@ -27,7 +27,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_url.h>
 #include "cmd_add_item.hpp"
 

modules/gui/skins2/commands/cmd_audio.cpp

@@ -23,7 +23,7 @@
 
 #include "cmd_audio.hpp"
 #include "../src/vlcproc.hpp"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <string>
 

modules/gui/skins2/commands/cmd_dvd.cpp

@@ -23,7 +23,7 @@
 
 #include "cmd_dvd.hpp"
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 void CmdDvdNextTitle::execute()
 {

modules/gui/skins2/commands/cmd_fullscreen.cpp

@@ -25,7 +25,7 @@
 #include "cmd_fullscreen.hpp"
 #include <vlc_input.h>
 #include <vlc_vout.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 
 void CmdFullscreen::execute()

modules/gui/skins2/commands/cmd_input.cpp

@@ -25,7 +25,7 @@
 #include "cmd_input.hpp"
 #include "cmd_dialogs.hpp"
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 void CmdPlay::execute()
 {

modules/gui/skins2/commands/cmd_playlist.cpp

@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include "cmd_playlist.hpp"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_url.h>
 #include "../src/vlcproc.hpp"
 #include "../utils/var_bool.hpp"

modules/gui/skins2/commands/cmd_playtree.cpp

@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 #include "cmd_playtree.hpp"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include "../src/vlcproc.hpp"
 #include "../utils/var_bool.hpp"
 

modules/gui/skins2/commands/cmd_vars.hpp

@@ -29,7 +29,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input_item.h>
 
 #include "cmd_generic.hpp"

modules/gui/skins2/src/dialogs.cpp

@@ -29,7 +29,7 @@
 #include "../commands/cmd_quit.hpp"
 #include "../commands/cmd_playlist.hpp"
 #include "../commands/cmd_playtree.hpp"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_modules.h>
 #include <vlc_url.h>
 

modules/gui/skins2/src/skin_main.cpp

@@ -30,7 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_threads.h>
 #include <vlc_vout_window.h>
 #include <vlc_vout_display.h>

modules/gui/skins2/src/vlcproc.cpp

@@ -30,7 +30,7 @@
 #include <vlc_common.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_url.h>
 #include <vlc_strings.h>
 

modules/gui/skins2/vars/equalizer.cpp

@@ -26,7 +26,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_aout.h>
 #include "equalizer.hpp"

modules/gui/skins2/vars/playtree.cpp

@@ -30,7 +30,7 @@
 #include <vlc_common.h>
 
 #include "playtree.hpp"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input_item.h>
 #include <vlc_url.h>
 #include "../utils/ustring.hpp"

modules/gui/skins2/vars/playtree.hpp

@@ -25,7 +25,7 @@
 #ifndef PLAYTREE_HPP
 #define PLAYTREE_HPP
 
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include "../utils/var_tree.hpp"
 
 #include <map>

modules/gui/skins2/vars/volume.cpp

@@ -28,7 +28,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_aout.h>
 #include "volume.hpp"
 #include <math.h>

modules/lua/libs/input.c

@@ -35,7 +35,7 @@
 #include <vlc_common.h>
 #include <vlc_meta.h>
 #include <vlc_url.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include <assert.h>
 

modules/lua/libs/playlist.c

@@ -35,7 +35,7 @@
 #include <vlc_common.h>
 
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include "../vlc.h"
 #include "../libs.h"

modules/lua/libs/sd.c

@@ -37,7 +37,7 @@
 #include <math.h>
 #include <vlc_common.h>
 #include <vlc_services_discovery.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_charset.h>
 #include <vlc_md5.h>
 

modules/lua/libs/volume.c

@@ -37,7 +37,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_meta.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_aout.h>
 
 #include "../vlc.h"

modules/lua/vlc.h

@@ -30,7 +30,7 @@
 
 #include <vlc_common.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_meta.h>
 #include <vlc_meta_fetcher.h>
 #include <vlc_url.h>

modules/misc/audioscrobbler.c

@@ -50,7 +50,7 @@
 #include <vlc_stream.h>
 #include <vlc_url.h>
 #include <vlc_tls.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 /*****************************************************************************
  * Local prototypes

modules/misc/playlist/html.c

@@ -26,7 +26,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_strings.h>
 

modules/misc/playlist/m3u.c

@@ -30,7 +30,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>

modules/misc/playlist/xspf.c

@@ -31,7 +31,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_strings.h>
 #include <vlc_url.h>

modules/notify/notify.c

@@ -33,7 +33,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_url.h>
 
 #include <gtk/gtk.h>

modules/notify/osx_notifications.m

@@ -37,7 +37,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_meta.h>
 #include <vlc_interface.h>

po/POTFILES.in

@@ -35,7 +35,7 @@ include/vlc_tick.h
 include/vlc_network.h
 include/vlc_objects.h
 include/vlc_pgpkey.h
-include/vlc_playlist.h
+include/vlc_playlist_legacy.h
 include/vlc_plugin.h
 include/vlc_rand.h
 include/vlc_services_discovery.h
@@ -122,15 +122,15 @@ src/network/rootbind.c
 src/network/tcp.c
 src/network/tls.c
 src/network/udp.c
-src/playlist/control.c
-src/playlist/engine.c
-src/playlist/item.c
-src/playlist/loadsave.c
-src/playlist/playlist_internal.h
-src/playlist/search.c
-src/playlist/sort.c
-src/playlist/thread.c
-src/playlist/tree.c
+src/playlist_legacy/control.c
+src/playlist_legacy/engine.c
+src/playlist_legacy/item.c
+src/playlist_legacy/loadsave.c
+src/playlist_legacy/playlist_internal.h
+src/playlist_legacy/search.c
+src/playlist_legacy/sort.c
+src/playlist_legacy/thread.c
+src/playlist_legacy/tree.c
 src/stream_output/sap.c
 src/stream_output/sdp.c
 src/stream_output/stream_output.c

src/Makefile.am

@@ -76,7 +76,7 @@ pluginsinclude_HEADERS = \
 	../include/vlc_picture.h \
 	../include/vlc_picture_fifo.h \
 	../include/vlc_picture_pool.h \
-	../include/vlc_playlist.h \
+	../include/vlc_playlist_legacy.h \
 	../include/vlc_plugin.h \
 	../include/vlc_probe.h \
 	../include/vlc_rand.h \
@@ -213,18 +213,18 @@ libvlccore_la_SOURCES = \
 	modules/textdomain.c \
 	interface/dialog.c \
 	interface/interface.c \
-	playlist/playlist_internal.h \
-	playlist/aout.c \
-	playlist/thread.c \
-	playlist/control.c \
-	playlist/engine.c \
-	playlist/sort.c \
-	playlist/loadsave.c \
-	playlist/tree.c \
-	playlist/item.c \
-	playlist/search.c \
-	playlist/services_discovery.c \
-	playlist/renderer.c \
+	playlist_legacy/playlist_internal.h \
+	playlist_legacy/aout.c \
+	playlist_legacy/thread.c \
+	playlist_legacy/control.c \
+	playlist_legacy/engine.c \
+	playlist_legacy/sort.c \
+	playlist_legacy/loadsave.c \
+	playlist_legacy/tree.c \
+	playlist_legacy/item.c \
+	playlist_legacy/search.c \
+	playlist_legacy/services_discovery.c \
+	playlist_legacy/renderer.c \
 	preparser/art.c \
 	preparser/art.h \
 	preparser/fetcher.c \

src/input/meta.c

@@ -29,7 +29,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_url.h>
 #include <vlc_arrays.h>
 #include <vlc_modules.h>

src/interface/interface.c

@@ -42,9 +42,9 @@
 #include <vlc_common.h>
 #include <vlc_modules.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include "libvlc.h"
-#include "playlist/playlist_internal.h"
+#include "playlist_legacy/playlist_internal.h"
 #include "../lib/libvlc_internal.h"
 
 static int AddIntfCallback( vlc_object_t *, char const *,

src/libvlc-module.c

@@ -36,7 +36,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_cpu.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include "libvlc.h"
 #include "modules/modules.h"
 

src/libvlc.c

@@ -51,7 +51,7 @@
 
 #include "config/vlc_getopt.h"
 
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_interface.h>
 
 #include <vlc_actions.h>
@@ -66,7 +66,7 @@
 #include <vlc_thumbnailer.h>
 
 #include "libvlc.h"
-#include "playlist/playlist_internal.h"
+#include "playlist_legacy/playlist_internal.h"
 #include "misc/variables.h"
 
 #include <vlc_vlm.h>

src/os2/specific.c

@@ -24,7 +24,7 @@
 
 #include <vlc_common.h>
 #include "../libvlc.h"
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
 #include <vlc_url.h>

src/playlist_legacy/aout.c

@@ -28,7 +28,7 @@
 
 #include <vlc_common.h>
 #include <vlc_aout.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 
 #include "../audio_output/aout_internal.h"
 #include "playlist_internal.h"

src/playlist_legacy/control.c

@@ -26,7 +26,7 @@
 #endif
 
 #include <vlc_common.h>
-#include "vlc_playlist.h"
+#include "vlc_playlist_legacy.h"
 #include "playlist_internal.h"
 #include <assert.h>
 

src/playlist_legacy/engine.c

@@ -31,7 +31,7 @@
 #include <vlc_common.h>
 #include <vlc_arrays.h>
 #include <vlc_sout.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_interface.h>
 #include <vlc_http.h>
 #include <vlc_renderer_discovery.h>

src/playlist_legacy/item.c

@@ -32,7 +32,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_rand.h>
 #include "playlist_internal.h"
 #include "libvlc.h"

src/playlist_legacy/loadsave.c

@@ -30,7 +30,7 @@
 #include <unistd.h>
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_events.h>
 #include "playlist_internal.h"
 #include "config/configuration.h"

src/playlist_legacy/renderer.c

@@ -25,10 +25,10 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_renderer_discovery.h>
 
-#include "playlist/playlist_internal.h"
+#include "playlist_internal.h"
 
 int playlist_SetRenderer( playlist_t* p_playlist, vlc_renderer_item_t* p_item )
 {

src/playlist_legacy/search.c

@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_charset.h>
 #include "playlist_internal.h"
 

src/playlist_legacy/services_discovery.c

@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_services_discovery.h>
 #include "playlist_internal.h"
 

src/playlist_legacy/sort.c

@@ -29,7 +29,7 @@
 #include <vlc_common.h>
 #include <vlc_rand.h>
 #define  VLC_INTERNAL_PLAYLIST_SORT_FUNCTIONS
-#include "vlc_playlist.h"
+#include "vlc_playlist_legacy.h"
 #include "playlist_internal.h"
 
 

src/playlist_legacy/thread.c

@@ -31,7 +31,7 @@
 #include <vlc_es.h>
 #include <vlc_input.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
+#include <vlc_playlist_legacy.h>
 #include <vlc_rand.h>
 #include <vlc_renderer_discovery.h>
 #include "playlist_internal.h"

src/playlist_legacy/tree.c

@@ -26,7 +26,7 @@
 
 #include <vlc_common.h>
 #include <assert.h>
-#include "vlc_playlist.h"
+#include "vlc_playlist_legacy.h"
 #include "playlist_internal.h"
 
 /************************************************************************