Revert "Revert "redundant includes of vlc_playlist.h""

This reverts commit eca93931a367e3acedaa6028e8843552ced4a1d0.
and fixes taglib compile

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 3fb65ca8ad5f4ae52b2c02884c7eec6455d90608..5d1305333594644c0ae90c79357ce9b8acbb46f0 100644 (file)
--- a/modules/meta_engine/folder.c
+++ b/modules/meta_engine/folder.c
@@ -31,10 +31,10 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
 #include <vlc_art_finder.h>
 #include <vlc_fs.h>
 #include <vlc_url.h>
+#include <vlc_input_item.h>
 
 #ifdef HAVE_SYS_STAT_H
 #   include <sys/stat.h>

diff --git a/modules/meta_engine/id3tag.c b/modules/meta_engine/id3tag.c
index 9d8de17dbf9aa2b038a33c14acb4d1441c4cf582..64c304f393d188cb0759270d3b163524d4a7db0a 100644 (file)
--- a/modules/meta_engine/id3tag.c
+++ b/modules/meta_engine/id3tag.c
@@ -35,7 +35,6 @@
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_demux.h>
-#include <vlc_playlist.h>
 #include <vlc_charset.h>
 
 #include <sys/types.h>

diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 91323d2db240a9dd44754726fabd9971e0e18cb5..4ededfdab235a1fa28a574a5c3342178e53044a7 100644 (file)
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -29,12 +29,13 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
 #include <vlc_meta.h>
 #include <vlc_demux.h>
 #include <vlc_strings.h>
 #include <vlc_charset.h>
 #include <vlc_url.h>
+#include <vlc_input_item.h>
+#include <vlc_input.h> /* for attachment_new */
 
 #ifdef WIN32
 # include <io.h>

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index 14c7197331a9c1528b32f350d1696ab26df57a0d..e633f9d857dd172644167c676bc326796e9b2313 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -32,7 +32,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
 #include <vlc_fs.h>
 
 #include <assert.h>

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index fcd64b915a7cac627aa1aeed05b61251da2ca332..081f1b1c585451ede281e59ecd722bc376a8eae8 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -36,7 +36,6 @@
 #include <vlc_meta.h>
 
 #include <vlc_interface.h>
-#include <vlc_playlist.h>
 #include <vlc_aout.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/modules/misc/lua/meta.c b/modules/misc/lua/meta.c
index 01f262097b3ae60888eef8f6185c64c26337ccfb..019c657ac1069a53295f9af304106126fbb6b0cb 100644 (file)
--- a/modules/misc/lua/meta.c
+++ b/modules/misc/lua/meta.c
@@ -35,7 +35,6 @@
 
 #include <vlc_common.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
 #include <vlc_meta.h>
 #include <vlc_demux.h>
 #include <vlc_art_finder.h>

diff --git a/modules/misc/lua/services_discovery.c b/modules/misc/lua/services_discovery.c
index 65b67a0d891fb6d5d6b31acb08d6a1c7caef06ab..467a4aae4a34f98dfd629ebfa333d29b56c87e65 100644 (file)
--- a/modules/misc/lua/services_discovery.c
+++ b/modules/misc/lua/services_discovery.c
@@ -26,7 +26,6 @@
 
 #include <vlc_common.h>
 #include <vlc_services_discovery.h>
-#include <vlc_playlist.h>
 
 #include "vlc.h"
 #include "libs.h"

diff --git a/modules/services_discovery/mtp.c b/modules/services_discovery/mtp.c
index a63a9f8dff3ca7f48f7ca4ddb16315bdd839d6c6..b21621f89d7d63b5793dd2d6a755208ae496375f 100644 (file)
--- a/modules/services_discovery/mtp.c
+++ b/modules/services_discovery/mtp.c
@@ -25,7 +25,6 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_playlist.h>
 #include <vlc_plugin.h>
 #include <vlc_interface.h>
 #include <vlc_services_discovery.h>

diff --git a/modules/services_discovery/podcast.c b/modules/services_discovery/podcast.c
index 6c4584134c60a1f0baeb83992575ab1b3739ae93..6285b52389243a442c998f1caf0e2ac1ab1f03e6 100644 (file)
--- a/modules/services_discovery/podcast.c
+++ b/modules/services_discovery/podcast.c
@@ -31,7 +31,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
 #include <vlc_services_discovery.h>
 
 #include <vlc_network.h>

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 3cd985f104bf9a082fa390e72022ecb89bbd0233..58d5d482ae227984df7e95e25c5c6ccd8eb478be 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -38,7 +38,6 @@
 #include <vlc_filter.h>
 #include <vlc_image.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
 
 #include <cxcore.h>
 #include <cv.h>

diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index 619e664fddec95255058c757c941b093fa3ed7bc..eeb6ca89bbdcfd002b79bed0952ea6ad4b0779d5 100644 (file)
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -33,7 +33,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_playlist.h>
 #include <vlc_vout_display.h>
 
 #include <windows.h>