[vlc-commits] Remove vlc_input.h from vlc_playlist.h
Rémi Denis-Courmont
git at videolan.org
Fri Aug 15 22:08:47 CEST 2014
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Aug 15 23:00:13 2014 +0300| [5adb3308b8f818c6175c49aa91c9617c9d85b70c] | committer: Rémi Denis-Courmont
Remove vlc_input.h from vlc_playlist.h
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5adb3308b8f818c6175c49aa91c9617c9d85b70c
---
include/vlc_playlist.h | 1 -
modules/control/dbus/dbus.c | 1 +
modules/control/dbus/dbus_player.c | 1 +
modules/control/dbus/dbus_tracklist.c | 1 +
modules/control/gestures.c | 1 +
modules/control/motion.c | 1 +
modules/control/rc.c | 8 ++++----
modules/control/win_msg.c | 1 +
modules/gui/qt4/components/playlist/playlist_item.cpp | 1 +
modules/gui/qt4/components/playlist/selector.hpp | 2 ++
modules/gui/qt4/components/playlist/sorting.h | 3 +++
modules/gui/qt4/components/playlist/views.cpp | 2 +-
modules/gui/qt4/dialogs/messages.cpp | 7 +++++--
modules/gui/qt4/recents.cpp | 2 ++
modules/gui/skins2/commands/cmd_quit.cpp | 2 +-
modules/gui/skins2/commands/cmd_vars.hpp | 1 +
modules/gui/skins2/vars/playtree.cpp | 1 +
modules/misc/audioscrobbler.c | 1 +
18 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/include/vlc_playlist.h b/include/vlc_playlist.h
index 49dcd15..2c64a7c 100644
--- 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 bbf7f7b..b3da27b 100644
--- 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 0906934..494d9d5 100644
--- 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 577e231..8c71250 100644
--- 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 53e440c..d526971 100644
--- 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 8d74e89..80196ad 100644
--- 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 8e5a162..0af8619 100644
--- 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 167ecac..32c890c 100644
--- 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 0fbbcba..1a130aa 100644
--- 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 2daaa54..1c3ac1f 100644
--- 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 7762327..37ecd79 100644
--- 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 4530660..52a150a 100644
--- 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 30793a2..252dcc4 100644
--- 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 d2294a9..fede5e4 100644
--- 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 e8961f5..147304e 100644
--- 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 a27e7aa..a315abf 100644
--- 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 1cb635a..f11c488 100644
--- 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 67c1941..bbda3c1 100644
--- 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>
More information about the vlc-commits
mailing list