vlc | branch: master | Thomas Guillem <[email protected]> | Thu Nov 15 14:48:19 2018 +0100| [034a3f75a24d917450eb17815fea30dec27b81f7] | committer: Thomas Guillem
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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=034a3f75a24d917450eb17815fea30dec27b81f7 --- include/{vlc_playlist.h => vlc_playlist_legacy.h} | 6 ++--- lib/media.c | 2 +- lib/playlist.c | 2 +- modules/control/dbus/dbus.c | 2 +- modules/control/dbus/dbus_player.c | 2 +- modules/control/dbus/dbus_root.c | 2 +- modules/control/dbus/dbus_tracklist.c | 2 +- modules/control/gestures.c | 2 +- modules/control/hotkeys.c | 2 +- modules/control/motion.c | 2 +- modules/control/netsync.c | 2 +- modules/control/oldrc.c | 2 +- modules/control/win_msg.c | 2 +- modules/gui/macosx/VLCCoreInteraction.m | 2 +- modules/gui/macosx/VLCMain.h | 2 +- modules/gui/macosx/VLCMainMenu.m | 2 +- modules/gui/macosx/VLCMainWindow.m | 2 +- modules/gui/macosx/VLCPLItem.m | 2 +- modules/gui/macosx/VLCPLModel.m | 2 +- modules/gui/macosx/VLCRendererItem.h | 2 +- modules/gui/macosx/VLCStatusBarIcon.m | 2 +- modules/gui/minimal_macosx/intf.m | 2 +- modules/gui/ncurses.c | 2 +- modules/gui/qt/components/playlist/playlist.hpp | 2 +- .../gui/qt/components/playlist/playlist_model.hpp | 2 +- modules/gui/qt/components/playlist/selector.cpp | 2 +- .../gui/qt/components/playlist/standardpanel.hpp | 2 +- modules/gui/qt/dialogs/epg.cpp | 2 +- modules/gui/qt/qt.hpp | 2 +- modules/gui/skins2/commands/cmd_add_item.cpp | 2 +- modules/gui/skins2/commands/cmd_audio.cpp | 2 +- modules/gui/skins2/commands/cmd_dvd.cpp | 2 +- modules/gui/skins2/commands/cmd_fullscreen.cpp | 2 +- modules/gui/skins2/commands/cmd_input.cpp | 2 +- modules/gui/skins2/commands/cmd_playlist.cpp | 2 +- modules/gui/skins2/commands/cmd_playtree.cpp | 2 +- modules/gui/skins2/commands/cmd_vars.hpp | 2 +- modules/gui/skins2/src/dialogs.cpp | 2 +- modules/gui/skins2/src/skin_main.cpp | 2 +- modules/gui/skins2/src/vlcproc.cpp | 2 +- modules/gui/skins2/vars/equalizer.cpp | 2 +- modules/gui/skins2/vars/playtree.cpp | 2 +- modules/gui/skins2/vars/playtree.hpp | 2 +- modules/gui/skins2/vars/volume.cpp | 2 +- modules/lua/libs/input.c | 2 +- modules/lua/libs/playlist.c | 2 +- modules/lua/libs/sd.c | 2 +- modules/lua/libs/volume.c | 2 +- modules/lua/vlc.h | 2 +- modules/misc/audioscrobbler.c | 2 +- modules/misc/playlist/html.c | 2 +- modules/misc/playlist/m3u.c | 2 +- modules/misc/playlist/xspf.c | 2 +- modules/notify/notify.c | 2 +- modules/notify/osx_notifications.m | 2 +- po/POTFILES.in | 20 ++++++++--------- src/Makefile.am | 26 +++++++++++----------- src/input/meta.c | 2 +- src/interface/interface.c | 4 ++-- src/libvlc-module.c | 2 +- src/libvlc.c | 4 ++-- src/os2/specific.c | 2 +- src/{playlist => playlist_legacy}/aout.c | 2 +- src/{playlist => playlist_legacy}/control.c | 2 +- src/{playlist => playlist_legacy}/engine.c | 2 +- src/{playlist => playlist_legacy}/item.c | 2 +- src/{playlist => playlist_legacy}/loadsave.c | 2 +- .../playlist_internal.h | 0 src/{playlist => playlist_legacy}/renderer.c | 4 ++-- src/{playlist => playlist_legacy}/search.c | 2 +- .../services_discovery.c | 2 +- src/{playlist => playlist_legacy}/sort.c | 2 +- src/{playlist => playlist_legacy}/thread.c | 2 +- src/{playlist => playlist_legacy}/tree.c | 2 +- 74 files changed, 99 insertions(+), 99 deletions(-) diff --git a/include/vlc_playlist.h b/include/vlc_playlist_legacy.h similarity index 99% rename from include/vlc_playlist.h rename to include/vlc_playlist_legacy.h index 4b8aa2b832..e0de0ae76c 100644 --- a/include/vlc_playlist.h +++ b/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" { diff --git a/lib/media.c b/lib/media.c index cf3bd2c1b0..6786f7edcb 100644 --- a/lib/media.c +++ b/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> diff --git a/lib/playlist.c b/lib/playlist.c index acb4c15f73..0c29917916 100644 --- a/lib/playlist.c +++ b/lib/playlist.c @@ -30,7 +30,7 @@ #include <vlc/vlc.h> -#include <vlc_playlist.h> +#include <vlc_playlist_legacy.h> #include <assert.h> diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c index 9ac4fa3ad0..7582e8df35 100644 --- a/modules/control/dbus/dbus.c +++ b/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> diff --git a/modules/control/dbus/dbus_player.c b/modules/control/dbus/dbus_player.c index 8ed079cb46..ed1ea61147 100644 --- a/modules/control/dbus/dbus_player.c +++ b/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> diff --git a/modules/control/dbus/dbus_root.c b/modules/control/dbus/dbus_root.c index fe2d5a701c..8c5bdeb7a0 100644 --- a/modules/control/dbus/dbus_root.c +++ b/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> diff --git a/modules/control/dbus/dbus_tracklist.c b/modules/control/dbus/dbus_tracklist.c index 4a8254dc9c..606e204b76 100644 --- a/modules/control/dbus/dbus_tracklist.c +++ b/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> diff --git a/modules/control/gestures.c b/modules/control/gestures.c index b4f17fefe5..e7aed95fd4 100644 --- a/modules/control/gestures.c +++ b/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> diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 8ff5f114b4..6c60deaf09 100644 --- a/modules/control/hotkeys.c +++ b/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" diff --git a/modules/control/motion.c b/modules/control/motion.c index 11a48e1898..6fa07f921e 100644 --- a/modules/control/motion.c +++ b/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> diff --git a/modules/control/netsync.c b/modules/control/netsync.c index e6700fdbe1..339882f04c 100644 --- a/modules/control/netsync.c +++ b/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> diff --git a/modules/control/oldrc.c b/modules/control/oldrc.c index 732fd2eafa..88a362ec74 100644 --- a/modules/control/oldrc.c +++ b/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> diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c index 3587c18d6f..2733574d71 100644 --- a/modules/control/win_msg.c +++ b/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 diff --git a/modules/gui/macosx/VLCCoreInteraction.m b/modules/gui/macosx/VLCCoreInteraction.m index 9b7ffc04df..0cb5b9ccc3 100644 --- a/modules/gui/macosx/VLCCoreInteraction.m +++ b/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> diff --git a/modules/gui/macosx/VLCMain.h b/modules/gui/macosx/VLCMain.h index 9638ac2cab..4ebf14645c 100644 --- a/modules/gui/macosx/VLCMain.h +++ b/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> diff --git a/modules/gui/macosx/VLCMainMenu.m b/modules/gui/macosx/VLCMainMenu.m index 983492087d..d3b12cd6f5 100644 --- a/modules/gui/macosx/VLCMainMenu.m +++ b/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" diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m index bc8a1a24d7..51ee5003ad 100644 --- a/modules/gui/macosx/VLCMainWindow.m +++ b/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> diff --git a/modules/gui/macosx/VLCPLItem.m b/modules/gui/macosx/VLCPLItem.m index c23f18d143..503349a98b 100644 --- a/modules/gui/macosx/VLCPLItem.m +++ b/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 - diff --git a/modules/gui/macosx/VLCPLModel.m b/modules/gui/macosx/VLCPLModel.m index 048919850b..3b6f2cb10a 100644 --- a/modules/gui/macosx/VLCPLModel.m +++ b/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> diff --git a/modules/gui/macosx/VLCRendererItem.h b/modules/gui/macosx/VLCRendererItem.h index 3660b90eb0..e38c68d6b4 100644 --- a/modules/gui/macosx/VLCRendererItem.h +++ b/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 diff --git a/modules/gui/macosx/VLCStatusBarIcon.m b/modules/gui/macosx/VLCStatusBarIcon.m index 2b23ae6c88..e419c1c4fb 100644 --- a/modules/gui/macosx/VLCStatusBarIcon.m +++ b/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" diff --git a/modules/gui/minimal_macosx/intf.m b/modules/gui/minimal_macosx/intf.m index 111857b83f..6064e847c2 100644 --- a/modules/gui/minimal_macosx/intf.m +++ b/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> diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c index f9d208907e..794479fb65 100644 --- a/modules/gui/ncurses.c +++ b/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> diff --git a/modules/gui/qt/components/playlist/playlist.hpp b/modules/gui/qt/components/playlist/playlist.hpp index 64e7cc112b..667c4d95fd 100644 --- a/modules/gui/qt/components/playlist/playlist.hpp +++ b/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> diff --git a/modules/gui/qt/components/playlist/playlist_model.hpp b/modules/gui/qt/components/playlist/playlist_model.hpp index 92fe4e0f9c..e7aa945645 100644 --- a/modules/gui/qt/components/playlist/playlist_model.hpp +++ b/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" diff --git a/modules/gui/qt/components/playlist/selector.cpp b/modules/gui/qt/components/playlist/selector.cpp index df8e2559ab..70371b61d0 100644 --- a/modules/gui/qt/components/playlist/selector.cpp +++ b/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 ) diff --git a/modules/gui/qt/components/playlist/standardpanel.hpp b/modules/gui/qt/components/playlist/standardpanel.hpp index f6f54b63c3..2400919b76 100644 --- a/modules/gui/qt/components/playlist/standardpanel.hpp +++ b/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; diff --git a/modules/gui/qt/dialogs/epg.cpp b/modules/gui/qt/dialogs/epg.cpp index ab570169ce..604752c4ea 100644 --- a/modules/gui/qt/dialogs/epg.cpp +++ b/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> diff --git a/modules/gui/qt/qt.hpp b/modules/gui/qt/qt.hpp index 85211a8f27..64d18b2441 100644 --- a/modules/gui/qt/qt.hpp +++ b/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> diff --git a/modules/gui/skins2/commands/cmd_add_item.cpp b/modules/gui/skins2/commands/cmd_add_item.cpp index e1eba6f9e7..36910dd03b 100644 --- a/modules/gui/skins2/commands/cmd_add_item.cpp +++ b/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" diff --git a/modules/gui/skins2/commands/cmd_audio.cpp b/modules/gui/skins2/commands/cmd_audio.cpp index b57a0927f8..1d739f2062 100644 --- a/modules/gui/skins2/commands/cmd_audio.cpp +++ b/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> diff --git a/modules/gui/skins2/commands/cmd_dvd.cpp b/modules/gui/skins2/commands/cmd_dvd.cpp index 9e9c5f80c5..f101b7e26b 100644 --- a/modules/gui/skins2/commands/cmd_dvd.cpp +++ b/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() { diff --git a/modules/gui/skins2/commands/cmd_fullscreen.cpp b/modules/gui/skins2/commands/cmd_fullscreen.cpp index 7dcfe7923c..06605ce35e 100644 --- a/modules/gui/skins2/commands/cmd_fullscreen.cpp +++ b/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() diff --git a/modules/gui/skins2/commands/cmd_input.cpp b/modules/gui/skins2/commands/cmd_input.cpp index e0a6ecf939..9f0e2b4109 100644 --- a/modules/gui/skins2/commands/cmd_input.cpp +++ b/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() { diff --git a/modules/gui/skins2/commands/cmd_playlist.cpp b/modules/gui/skins2/commands/cmd_playlist.cpp index 7555c80e39..80944906c0 100644 --- a/modules/gui/skins2/commands/cmd_playlist.cpp +++ b/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" diff --git a/modules/gui/skins2/commands/cmd_playtree.cpp b/modules/gui/skins2/commands/cmd_playtree.cpp index 626ba09b03..080e0e0ebf 100644 --- a/modules/gui/skins2/commands/cmd_playtree.cpp +++ b/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" diff --git a/modules/gui/skins2/commands/cmd_vars.hpp b/modules/gui/skins2/commands/cmd_vars.hpp index 73aab30105..32cae2c771 100644 --- a/modules/gui/skins2/commands/cmd_vars.hpp +++ b/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" diff --git a/modules/gui/skins2/src/dialogs.cpp b/modules/gui/skins2/src/dialogs.cpp index f344f097d3..640761e821 100644 --- a/modules/gui/skins2/src/dialogs.cpp +++ b/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> diff --git a/modules/gui/skins2/src/skin_main.cpp b/modules/gui/skins2/src/skin_main.cpp index bd07df36fe..1872a1a1d1 100644 --- a/modules/gui/skins2/src/skin_main.cpp +++ b/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> diff --git a/modules/gui/skins2/src/vlcproc.cpp b/modules/gui/skins2/src/vlcproc.cpp index 43b43d1114..e11936a58d 100644 --- a/modules/gui/skins2/src/vlcproc.cpp +++ b/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> diff --git a/modules/gui/skins2/vars/equalizer.cpp b/modules/gui/skins2/vars/equalizer.cpp index 90a984ba1f..c8fe87745a 100644 --- a/modules/gui/skins2/vars/equalizer.cpp +++ b/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" diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp index e6ceabc48d..9c3d0929cc 100644 --- a/modules/gui/skins2/vars/playtree.cpp +++ b/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" diff --git a/modules/gui/skins2/vars/playtree.hpp b/modules/gui/skins2/vars/playtree.hpp index ed930ee019..3ab2c3c427 100644 --- a/modules/gui/skins2/vars/playtree.hpp +++ b/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> diff --git a/modules/gui/skins2/vars/volume.cpp b/modules/gui/skins2/vars/volume.cpp index b242d021c8..3fadcdf040 100644 --- a/modules/gui/skins2/vars/volume.cpp +++ b/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> diff --git a/modules/lua/libs/input.c b/modules/lua/libs/input.c index 01c5424381..6bde2655b0 100644 --- a/modules/lua/libs/input.c +++ b/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> diff --git a/modules/lua/libs/playlist.c b/modules/lua/libs/playlist.c index e6ba0eed24..29722158ff 100644 --- a/modules/lua/libs/playlist.c +++ b/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" diff --git a/modules/lua/libs/sd.c b/modules/lua/libs/sd.c index bcc6787159..4870ea3ca7 100644 --- a/modules/lua/libs/sd.c +++ b/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> diff --git a/modules/lua/libs/volume.c b/modules/lua/libs/volume.c index a060b883e7..5566a5725e 100644 --- a/modules/lua/libs/volume.c +++ b/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" diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h index 71f381d334..3ba4b9d61b 100644 --- a/modules/lua/vlc.h +++ b/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> diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c index a5466fcb47..99ae677a91 100644 --- a/modules/misc/audioscrobbler.c +++ b/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 diff --git a/modules/misc/playlist/html.c b/modules/misc/playlist/html.c index 069fbc6190..172df59af1 100644 --- a/modules/misc/playlist/html.c +++ b/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> diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c index ab50f80dd1..cd7ae7eab0 100644 --- a/modules/misc/playlist/m3u.c +++ b/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> diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c index 6476f08e2a..43d7af04fb 100644 --- a/modules/misc/playlist/xspf.c +++ b/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> diff --git a/modules/notify/notify.c b/modules/notify/notify.c index eecf36ad2b..3c18f14178 100644 --- a/modules/notify/notify.c +++ b/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> diff --git a/modules/notify/osx_notifications.m b/modules/notify/osx_notifications.m index 8ac215e851..5904d4b73d 100644 --- a/modules/notify/osx_notifications.m +++ b/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> diff --git a/po/POTFILES.in b/po/POTFILES.in index de741c37ff..de134cd667 100644 --- a/po/POTFILES.in +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 42a60bef8f..c344df0875 100644 --- a/src/Makefile.am +++ b/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 \ diff --git a/src/input/meta.c b/src/input/meta.c index 0cb62a8495..55832c9eaa 100644 --- a/src/input/meta.c +++ b/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> diff --git a/src/interface/interface.c b/src/interface/interface.c index 9910463065..510516d5c4 100644 --- a/src/interface/interface.c +++ b/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 *, diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 950c30d64d..a4fdd60c50 100644 --- a/src/libvlc-module.c +++ b/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" diff --git a/src/libvlc.c b/src/libvlc.c index b715cbcf29..6e4090efb0 100644 --- a/src/libvlc.c +++ b/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> diff --git a/src/os2/specific.c b/src/os2/specific.c index 9417c1108f..264b66a4ff 100644 --- a/src/os2/specific.c +++ b/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> diff --git a/src/playlist/aout.c b/src/playlist_legacy/aout.c similarity index 99% rename from src/playlist/aout.c rename to src/playlist_legacy/aout.c index d797a12a34..86777420f1 100644 --- a/src/playlist/aout.c +++ b/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" diff --git a/src/playlist/control.c b/src/playlist_legacy/control.c similarity index 99% rename from src/playlist/control.c rename to src/playlist_legacy/control.c index 7c0142cd0b..efef3bf7ef 100644 --- a/src/playlist/control.c +++ b/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> diff --git a/src/playlist/engine.c b/src/playlist_legacy/engine.c similarity index 99% rename from src/playlist/engine.c rename to src/playlist_legacy/engine.c index 01ecc741a0..2ffe0980f2 100644 --- a/src/playlist/engine.c +++ b/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> diff --git a/src/playlist/item.c b/src/playlist_legacy/item.c similarity index 99% rename from src/playlist/item.c rename to src/playlist_legacy/item.c index dcbfab7991..f1989eaeae 100644 --- a/src/playlist/item.c +++ b/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" diff --git a/src/playlist/loadsave.c b/src/playlist_legacy/loadsave.c similarity index 99% rename from src/playlist/loadsave.c rename to src/playlist_legacy/loadsave.c index 0f4d6480fa..ddb0eb566b 100644 --- a/src/playlist/loadsave.c +++ b/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" diff --git a/src/playlist/playlist_internal.h b/src/playlist_legacy/playlist_internal.h similarity index 100% rename from src/playlist/playlist_internal.h rename to src/playlist_legacy/playlist_internal.h diff --git a/src/playlist/renderer.c b/src/playlist_legacy/renderer.c similarity index 96% rename from src/playlist/renderer.c rename to src/playlist_legacy/renderer.c index 5ad0805948..fe5c5bde8b 100644 --- a/src/playlist/renderer.c +++ b/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 ) { diff --git a/src/playlist/search.c b/src/playlist_legacy/search.c similarity index 99% rename from src/playlist/search.c rename to src/playlist_legacy/search.c index ee09ca8c36..21afcdea30 100644 --- a/src/playlist/search.c +++ b/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" diff --git a/src/playlist/services_discovery.c b/src/playlist_legacy/services_discovery.c similarity index 99% rename from src/playlist/services_discovery.c rename to src/playlist_legacy/services_discovery.c index 0cc7298667..d8fcc02d1b 100644 --- a/src/playlist/services_discovery.c +++ b/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" diff --git a/src/playlist/sort.c b/src/playlist_legacy/sort.c similarity index 99% rename from src/playlist/sort.c rename to src/playlist_legacy/sort.c index 674cec394c..dd3a5ff593 100644 --- a/src/playlist/sort.c +++ b/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" diff --git a/src/playlist/thread.c b/src/playlist_legacy/thread.c similarity index 99% rename from src/playlist/thread.c rename to src/playlist_legacy/thread.c index 5f9700c4c8..d9f1b9854a 100644 --- a/src/playlist/thread.c +++ b/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" diff --git a/src/playlist/tree.c b/src/playlist_legacy/tree.c similarity index 99% rename from src/playlist/tree.c rename to src/playlist_legacy/tree.c index b55fded4b2..dc7867c42d 100644 --- a/src/playlist/tree.c +++ b/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" /************************************************************************ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
