Remove vlc_input.h from vlc_playlist.h

diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 49dcd1535bdff782f18463b5b45c80b298f8e5c5..2c64a7c2666de2f19cdc8d0aba527ac2fdc53624 100644 (file)
--- a/include/vlc_playlist.h
+++ b/include/vlc_playlist.h
@@ -28,7 +28,6 @@
 extern "C" {
 # endif
 
-#include <vlc_input.h>
 #include <vlc_events.h>
 
 TYPEDEF_ARRAY(playlist_item_t*, playlist_item_array_t)

diff --git a/modules/control/dbus/dbus.c b/modules/control/dbus/dbus.c
index bbf7f7b66522bba945313582f6215308c0e67005..b3da27b21e6fc991098dbe7e547953e702551c8f 100644 (file)
--- a/modules/control/dbus/dbus.c
+++ b/modules/control/dbus/dbus.c
@@ -57,6 +57,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 #include <vlc_meta.h>
 #include <vlc_mtime.h>
 #include <vlc_fs.h>

diff --git a/modules/control/dbus/dbus_player.c b/modules/control/dbus/dbus_player.c
index 09069343f412e7abaa6bab466decfb06877fc260..494d9d5b4d5e964db461005cd1d8e9c9af1f58f4 100644 (file)
--- a/modules/control/dbus/dbus_player.c
+++ b/modules/control/dbus/dbus_player.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 #include <vlc_interface.h>
 
 #include <math.h>

diff --git a/modules/control/dbus/dbus_tracklist.c b/modules/control/dbus/dbus_tracklist.c
index 577e231ef0bf8293ea91e6ecc89cc02796f893a0..8c712505ac76e05cdfde0985638a9964e80c20be 100644 (file)
--- a/modules/control/dbus/dbus_tracklist.c
+++ b/modules/control/dbus/dbus_tracklist.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 
 #include <assert.h>
 

diff --git a/modules/control/gestures.c b/modules/control/gestures.c
index 53e440c92f4a8dc87ec35c7595dc4d0775c373c1..d52697114a09ac4ec63fd01984456adc3f190492 100644 (file)
--- a/modules/control/gestures.c
+++ b/modules/control/gestures.c
@@ -34,6 +34,7 @@
 #include <vlc_interface.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 #include <assert.h>
 
 /*****************************************************************************

diff --git a/modules/control/motion.c b/modules/control/motion.c
index 8d74e89fa992897d3e0ab9bb6ba72224d9aaa90e..80196ad59e619186f3904a59099749e85642483a 100644 (file)
--- a/modules/control/motion.c
+++ b/modules/control/motion.c
@@ -37,6 +37,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 #include <vlc_vout.h>
 
 #include "motionlib.h"

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 8e5a162d1f80e723badd7c9b3a654baf661d6811..0af8619572830b743c04199c29983d606461e99f 100644 (file)
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -30,15 +30,15 @@
 # include "config.h"
 #endif
 
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-
 #include <errno.h>                                                 /* ENOMEM */
 #include <signal.h>
 #include <assert.h>
 #include <math.h>
 
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_interface.h>
+#include <vlc_input.h>
 #include <vlc_aout.h>
 #include <vlc_vout.h>
 #include <vlc_playlist.h>
@@ -47,9 +47,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+
 #include <vlc_network.h>
 #include <vlc_url.h>
-
 #include <vlc_charset.h>
 
 #if defined(PF_UNIX) && !defined(PF_LOCAL)

diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c
index 167ecac62830c8c80837c32e41d585c7be698ec0..32c890c055181b0e101095b210be262c20d35baf 100644 (file)
--- a/modules/control/win_msg.c
+++ b/modules/control/win_msg.c
@@ -29,6 +29,7 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
+#include <vlc_input.h>
 #include <vlc_url.h> // FIXME: move URL generation to calling process
 
 #include <windows.h>

diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp
index 0fbbcba09b4b098e38318b7d6edbf165e88d1fe5..1a130aa83a9af60a0cec7a19f2b78f79d24d0b56 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -30,6 +30,7 @@
 
 #include "qt4.hpp"
 #include "playlist_item.hpp"
+#include <vlc_input_item.h>
 
 /*************************************************************************
  * Playlist item implementation

diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index 2daaa5408c3fbcc1f208fd02c6c9e216c1a77c38..1c3ac1fb2157803dbffe2aa16b55ef2490065a58 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -109,6 +109,8 @@ private:
     QHBoxLayout*         layout;
 };
 
+#include <vlc_input_item.h>
+
 Q_DECLARE_METATYPE( playlist_item_t *);
 Q_DECLARE_METATYPE( input_item_t *);
 class PLSelector: public QTreeWidget

diff --git a/modules/gui/qt4/components/playlist/sorting.h b/modules/gui/qt4/components/playlist/sorting.h
index 7762327b67d1578fef7dc82564ac0b8810ae50fb..37ecd792a5c5fb9f5ea09872036f45353c657f83 100644 (file)
--- a/modules/gui/qt4/components/playlist/sorting.h
+++ b/modules/gui/qt4/components/playlist/sorting.h
@@ -23,7 +23,10 @@
 
 #ifndef _SORTING_H_
 #define _SORTING_H_
+
 #include <vlc_media_library.h>
+#include <vlc_input_item.h>
+
 /* You can use these numbers with | and & to determine what you want to show */
 enum
 {

diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp
index 45306607ab7596929751dffb71c58c034dc5877b..52a150aba1b462c571d1a6909fef118e94ef8ba9 100644 (file)
--- a/modules/gui/qt4/components/playlist/views.cpp
+++ b/modules/gui/qt4/components/playlist/views.cpp
@@ -35,7 +35,7 @@
 #include <QMetaType>
 #include <QHeaderView>
 
-#include "assert.h"
+#include <assert.h>
 
 /* ICON_SCALER comes currently from harrison-stetson method, so good value */
 #define ICON_SCALER         16

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 30793a20d4b51526728b8441335c1681e997800a..252dcc4aa09a21083a627afed1de754524853975 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -24,8 +24,6 @@
 # include "config.h"
 #endif
 
-#include "dialogs/messages.hpp"
-
 #include <QPlainTextEdit>
 #include <QTextCursor>
 #include <QTextBlock>
@@ -43,6 +41,11 @@
 
 #include <assert.h>
 
+#include <vlc_common.h>
+#include <vlc_input_item.h>
+
+#include "dialogs/messages.hpp"
+
 enum {
     MsgEvent_Type = QEvent::User + MsgEventTypeOffset + 1,
 };

diff --git a/modules/gui/qt4/recents.cpp b/modules/gui/qt4/recents.cpp
index d2294a91003abcf7462fc2247cef4d4861bb39f1..fede5e4793b245193e71257753fa6af56d2146e2 100644 (file)
--- a/modules/gui/qt4/recents.cpp
+++ b/modules/gui/qt4/recents.cpp
@@ -49,6 +49,8 @@
     #include <vlc_charset.h>
 #endif
 
+#include <vlc_input_item.h>
+
 RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
 {
     recents = QStringList();

diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp
index e8961f5b53d28ab7d14459814b67b503ba0b0c15..147304e8f294cf08841e77d95efe9d4eb8efc5fa 100644 (file)
--- a/modules/gui/skins2/commands/cmd_quit.cpp
+++ b/modules/gui/skins2/commands/cmd_quit.cpp
@@ -28,7 +28,7 @@
 
 #include <vlc_vout.h>
 #include <vlc_vout_osd.h>
-#include <vlc_playlist.h>
+#include <vlc_input.h>
 
 #include "cmd_quit.hpp"
 #include "../src/os_factory.hpp"

diff --git a/modules/gui/skins2/commands/cmd_vars.hpp b/modules/gui/skins2/commands/cmd_vars.hpp
index a27e7aa5aa9edb61d607d32cf028489426b07194..a315abf8ce9981789ffbcce68a33bf31f7c94b83 100644 (file)
--- a/modules/gui/skins2/commands/cmd_vars.hpp
+++ b/modules/gui/skins2/commands/cmd_vars.hpp
@@ -30,6 +30,7 @@
 
 #include <vlc_common.h>
 #include <vlc_playlist.h>
+#include <vlc_input_item.h>
 
 #include "cmd_generic.hpp"
 #include "../utils/ustring.hpp"

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index 1cb635ad2d27e9a60916146b491a0712b06f3795..f11c4884dac3ce2035331a16d3cb14b52f83f75f 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -31,6 +31,7 @@
 
 #include "playtree.hpp"
 #include <vlc_playlist.h>
+#include <vlc_input_item.h>
 #include <vlc_url.h>
 #include "../utils/ustring.hpp"
 

diff --git a/modules/misc/audioscrobbler.c b/modules/misc/audioscrobbler.c
index 67c194107e361e5403906dcc1359f532bec4d80d..bbda3c153cb300cbba0527a73fd81c5718ae704c 100644 (file)
--- a/modules/misc/audioscrobbler.c
+++ b/modules/misc/audioscrobbler.c
@@ -41,6 +41,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
+#include <vlc_input.h>
 #include <vlc_dialog.h>
 #include <vlc_meta.h>
 #include <vlc_md5.h>