vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 31 19:28:36 2013 +0200| [03c911f3425c95d5a0e8dfb7f73dfda7ceca5e37] | committer: Rémi Denis-Courmont
Useless #includes > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=03c911f3425c95d5a0e8dfb7f73dfda7ceca5e37 --- modules/control/hotkeys.c | 2 +- modules/gui/macosx/CoreInteraction.m | 3 ++- modules/gui/macosx/playlist.m | 1 - modules/gui/qt4/components/extended_panels.cpp | 1 - modules/gui/skins2/commands/cmd_quit.cpp | 3 ++- modules/lua/libs/osd.c | 2 +- modules/text_renderer/quartztext.c | 1 - modules/text_renderer/win32text.c | 1 - modules/video_filter/dynamicoverlay/dynamicoverlay.c | 1 - modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c | 1 - modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c | 1 - modules/video_filter/dynamicoverlay/dynamicoverlay_list.c | 1 - modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c | 1 - modules/video_filter/subsdelay.c | 1 - src/misc/filter_chain.c | 2 +- 15 files changed, 7 insertions(+), 15 deletions(-) diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 10d2ccc..b454e03 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -36,7 +36,7 @@ #include <vlc_input.h> #include <vlc_aout.h> #include <vlc_vout.h> -#include <vlc_osd.h> +#include <vlc_vout_osd.h> #include <vlc_playlist.h> #include <vlc_keys.h> #include "math.h" diff --git a/modules/gui/macosx/CoreInteraction.m b/modules/gui/macosx/CoreInteraction.m index b3552a7..5145205 100644 --- a/modules/gui/macosx/CoreInteraction.m +++ b/modules/gui/macosx/CoreInteraction.m @@ -29,7 +29,8 @@ #import <vlc_playlist.h> #import <vlc_input.h> #import <vlc_keys.h> -#import <vlc_osd.h> +#import <vlc_vout.h> +#import <vlc_vout_osd.h> #import <vlc/vlc.h> #import <vlc_strings.h> #import <vlc_url.h> diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m index 4995d95..c4360b8 100644 --- a/modules/gui/macosx/playlist.m +++ b/modules/gui/macosx/playlist.m @@ -50,7 +50,6 @@ #import "MainMenu.h" #include <vlc_keys.h> -#import <vlc_osd.h> #import <vlc_interface.h> #include <vlc_url.h> diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index f6b28c9..0ab2c3b 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -49,7 +49,6 @@ #include "../../audio_filter/equalizer_presets.h" #include <vlc_intf_strings.h> #include <vlc_vout.h> -#include <vlc_osd.h> #include <vlc_modules.h> #include <vlc_plugin.h> diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp index 92a4b74..e8961f5 100644 --- a/modules/gui/skins2/commands/cmd_quit.cpp +++ b/modules/gui/skins2/commands/cmd_quit.cpp @@ -26,7 +26,8 @@ # include "config.h" #endif -#include <vlc_osd.h> +#include <vlc_vout.h> +#include <vlc_vout_osd.h> #include <vlc_playlist.h> #include "cmd_quit.hpp" diff --git a/modules/lua/libs/osd.c b/modules/lua/libs/osd.c index 5870cb0..2d3ee1f 100644 --- a/modules/lua/libs/osd.c +++ b/modules/lua/libs/osd.c @@ -33,7 +33,7 @@ #endif #include <vlc_vout.h> -#include <vlc_osd.h> +#include <vlc_vout_osd.h> #include "../vlc.h" #include "../libs.h" diff --git a/modules/text_renderer/quartztext.c b/modules/text_renderer/quartztext.c index 4f6a204..f0da836 100644 --- a/modules/text_renderer/quartztext.c +++ b/modules/text_renderer/quartztext.c @@ -33,7 +33,6 @@ #include <vlc_common.h> #include <vlc_plugin.h> -#include <vlc_osd.h> #include <vlc_stream.h> #include <vlc_xml.h> #include <vlc_input.h> diff --git a/modules/text_renderer/win32text.c b/modules/text_renderer/win32text.c index 95eb877..f759085 100644 --- a/modules/text_renderer/win32text.c +++ b/modules/text_renderer/win32text.c @@ -34,7 +34,6 @@ #include <vlc_charset.h> #include <vlc_plugin.h> #include <vlc_vout.h> -#include <vlc_osd.h> #include <vlc_block.h> #include <vlc_filter.h> diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index 9476500..789c272 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c @@ -33,7 +33,6 @@ #include <vlc_sout.h> #include <vlc_vout.h> #include <vlc_filter.h> -#include <vlc_osd.h> #include <vlc_fs.h> #include <ctype.h> diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c index ca79eea..9d0fc34 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_buffer.c @@ -27,7 +27,6 @@ #endif #include <vlc_common.h> -#include <vlc_osd.h> #include <vlc_filter.h> #include <ctype.h> diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c index c77a2f8..855b9d6 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c @@ -30,7 +30,6 @@ #include <vlc_arrays.h> #include <vlc_vout.h> #include <vlc_filter.h> -#include <vlc_osd.h> #include <string.h> #include <ctype.h> diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c index 2d911e8..1eca32d 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_list.c @@ -27,7 +27,6 @@ #endif #include <vlc_common.h> -#include <vlc_osd.h> #include <vlc_memory.h> #include "dynamicoverlay.h" diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c index d92ac5d..7f27d4a 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_queue.c @@ -27,7 +27,6 @@ #endif #include <vlc_common.h> -#include <vlc_osd.h> #include "dynamicoverlay.h" diff --git a/modules/video_filter/subsdelay.c b/modules/video_filter/subsdelay.c index d693db8..6395db2 100644 --- a/modules/video_filter/subsdelay.c +++ b/modules/video_filter/subsdelay.c @@ -33,7 +33,6 @@ #include <vlc_plugin.h> #include <vlc_filter.h> #include <vlc_subpicture.h> -#include <vlc_osd.h> #include <vlc_es.h> #include <stdlib.h> diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c index e58551b..d4c0941 100644 --- a/src/misc/filter_chain.c +++ b/src/misc/filter_chain.c @@ -26,8 +26,8 @@ #endif #include <vlc_filter.h> -#include <vlc_osd.h> #include <vlc_modules.h> +#include <vlc_spu.h> #include <libvlc.h> #include <assert.h> _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
