From c78699e53d95924690f12c14dad499b82e84c1bb Mon Sep 17 00:00:00 2001
From: Ilkka Ollakka <ileoo@videolan.org>
Date: Fri, 11 Jun 2010 22:28:32 +0300
Subject: [PATCH] Revert "Revert "redundant includes of vlc_playlist.h""

This reverts commit eca93931a367e3acedaa6028e8843552ced4a1d0.
and fixes taglib compile
---
 modules/meta_engine/folder.c          | 2 +-
 modules/meta_engine/id3tag.c          | 1 -
 modules/meta_engine/taglib.cpp        | 3 ++-
 modules/misc/logger.c                 | 1 -
 modules/misc/lua/intf.c               | 1 -
 modules/misc/lua/meta.c               | 1 -
 modules/misc/lua/services_discovery.c | 1 -
 modules/services_discovery/mtp.c      | 1 -
 modules/services_discovery/podcast.c  | 1 -
 modules/video_filter/opencv_wrapper.c | 1 -
 modules/video_output/msw/wingdi.c     | 1 -
 11 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/modules/meta_engine/folder.c b/modules/meta_engine/folder.c
index 3fb65ca8ad..5d13053335 100644
--- 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 9d8de17dbf..64c304f393 100644
--- 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 91323d2db2..4ededfdab2 100644
--- 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 14c7197331..e633f9d857 100644
--- 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 fcd64b915a..081f1b1c58 100644
--- 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 01f262097b..019c657ac1 100644
--- 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 65b67a0d89..467a4aae4a 100644
--- 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 a63a9f8dff..b21621f89d 100644
--- 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 6c4584134c..6285b52389 100644
--- 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 3cd985f104..58d5d482ae 100644
--- 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 619e664fdd..eeb6ca89bb 100644
--- 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>
-- 
2.39.2