From: Laurent Aimar <fenrir@videolan.org>
Date: Tue, 4 May 2010 19:46:17 +0000 (+0200)
Subject: Removed now useless vlc_osd.h includes.
X-Git-Tag: 1.2.0-pre1~6764
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a01d5d94f9292d300411c67b30ce1075923a3080;p=vlc

Removed now useless vlc_osd.h includes.
---

diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c
index 8b474481e5..20284b2cd8 100644
--- a/modules/codec/avcodec/subtitle.c
+++ b/modules/codec/avcodec/subtitle.c
@@ -32,7 +32,6 @@
 #include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_avcodec.h>
-#include <vlc_osd.h>
 
 /* ffmpeg header */
 #ifdef HAVE_LIBAVCODEC_AVCODEC_H
diff --git a/modules/codec/cc.c b/modules/codec/cc.c
index 237d875ea6..ee20e50d5e 100644
--- a/modules/codec/cc.c
+++ b/modules/codec/cc.c
@@ -42,7 +42,6 @@
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_image.h>
 #include <vlc_charset.h>
diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index ee12f48b39..7f697bdf87 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -32,7 +32,6 @@
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 #include "../demux/xiph.h"
 
 #include <kate/kate.h>
diff --git a/modules/codec/libass.c b/modules/codec/libass.c
index d98d34db04..77e66bcb9b 100644
--- a/modules/codec/libass.c
+++ b/modules/codec/libass.c
@@ -37,7 +37,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 #include <vlc_input.h>
 #include <vlc_dialog.h>
 
diff --git a/modules/codec/subtitles/subsdec.h b/modules/codec/subtitles/subsdec.h
index 11db067373..aaf307dd1b 100644
--- a/modules/codec/subtitles/subsdec.h
+++ b/modules/codec/subtitles/subsdec.h
@@ -31,7 +31,6 @@
 #include <vlc_codec.h>
 #include <vlc_input.h>
 
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_image.h>
 #include <vlc_charset.h>
diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c
index c8210d1146..7751e82044 100644
--- a/modules/codec/svcdsub.c
+++ b/modules/codec/svcdsub.c
@@ -34,7 +34,6 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
-#include <vlc_osd.h>
 #include <vlc_bits.h>
 
 /*****************************************************************************
diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 75ae69bef1..720eb6430d 100644
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -47,7 +47,7 @@
 #include <libzvbi.h>
 
 #include <vlc_codec.h>
-#include <vlc_osd.h>
+#include <vlc_vout_osd.h>
 
 /*****************************************************************************
  * Module descriptor.
diff --git a/modules/misc/freetype.c b/modules/misc/freetype.c
index e8f9bbfc3c..5fc41fd455 100644
--- a/modules/misc/freetype.c
+++ b/modules/misc/freetype.c
@@ -33,7 +33,6 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_osd.h>
 #include <vlc_filter.h>
 #include <vlc_stream.h>
 #include <vlc_xml.h>
diff --git a/modules/stream_out/transcode/osd.c b/modules/stream_out/transcode/osd.c
index 4424f6ecd7..24485416e4 100644
--- a/modules/stream_out/transcode/osd.c
+++ b/modules/stream_out/transcode/osd.c
@@ -30,7 +30,7 @@
 
 #include "transcode.h"
 
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 
 /*
  * OSD menu
diff --git a/modules/stream_out/transcode/spu.c b/modules/stream_out/transcode/spu.c
index 95db5e2daf..c53a3c2eef 100644
--- a/modules/stream_out/transcode/spu.c
+++ b/modules/stream_out/transcode/spu.c
@@ -31,7 +31,7 @@
 #include "transcode.h"
 
 #include <vlc_meta.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 #include <assert.h>
 
 static subpicture_t *spu_new_buffer( decoder_t *p_dec,
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 724a44da95..3d4a846bdd 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -34,7 +34,7 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 
 #include "transcode.h"
 
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 7a1dd8a877..246d4eaa95 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -31,7 +31,7 @@
 #include "transcode.h"
 
 #include <vlc_meta.h>
-#include <vlc_osd.h>
+#include <vlc_spu.h>
 
 #define ENC_FRAMERATE (25 * 1000 + .5)
 #define ENC_FRAMERATE_BASE 1000
diff --git a/modules/video_filter/audiobargraph_v.c b/modules/video_filter/audiobargraph_v.c
index 3d16738ec9..156b0ec174 100644
--- a/modules/video_filter/audiobargraph_v.c
+++ b/modules/video_filter/audiobargraph_v.c
@@ -35,7 +35,6 @@
 #include <vlc_filter.h>
 
 #include <vlc_image.h>
-#include <vlc_osd.h>
 
 #ifdef LoadImage
 #   undef LoadImage
diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 6db8e4d67c..c15f1e3648 100644
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -36,7 +36,6 @@
 #include <vlc_filter.h>
 
 #include <vlc_image.h>
-#include <vlc_osd.h>
 
 #ifdef LoadImage
 #   undef LoadImage
diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c
index 3365530a77..e13beb0cc3 100644
--- a/modules/video_filter/marq.c
+++ b/modules/video_filter/marq.c
@@ -36,7 +36,6 @@
 
 #include <vlc_filter.h>
 #include <vlc_block.h>
-#include <vlc_osd.h>
 
 #include <vlc_strings.h>
 
diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index 97dfe004ee..f11ec0798a 100644
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -56,7 +56,6 @@
 
 #include <vlc_filter.h>
 #include <vlc_image.h>
-#include <vlc_osd.h>
 #include <vlc_keys.h>
 
 #include <vlc_network.h>
diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c
index 91c573c5c0..30ce5c7bc5 100644
--- a/modules/video_filter/rss.c
+++ b/modules/video_filter/rss.c
@@ -40,7 +40,6 @@
 
 #include <vlc_filter.h>
 #include <vlc_block.h>
-#include <vlc_osd.h>
 
 #include <vlc_stream.h>
 #include <vlc_xml.h>