From b36c70ca7dcb047529ad0c8b9fdb26a883efa3de Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 18 Jan 2012 20:08:42 +0000 Subject: [PATCH] Move a pile of things that shouldn't be in headers out of the headers Originally committed to SVN as r6308. --- aegisub/src/auto4_lua.cpp | 1 + aegisub/src/auto4_lua.h | 1 - aegisub/src/auto4_lua_dialog.cpp | 1 + aegisub/src/command/video.cpp | 1 + aegisub/src/dialog_dummy_video.cpp | 17 +++++++++- aegisub/src/dialog_dummy_video.h | 35 +++++--------------- aegisub/src/dialog_text_import.cpp | 7 ++-- aegisub/src/dialog_text_import.h | 16 --------- aegisub/src/include/aegisub/video_provider.h | 7 +++- aegisub/src/threaded_frame_source.cpp | 1 + aegisub/src/threaded_frame_source.h | 3 +- aegisub/src/video_provider_avs.h | 1 + aegisub/src/video_provider_cache.cpp | 5 ++- aegisub/src/video_provider_dummy.h | 1 + aegisub/src/video_provider_ffmpegsource.h | 2 +- aegisub/src/video_provider_yuv4mpeg.cpp | 4 ++- 16 files changed, 49 insertions(+), 54 deletions(-) diff --git a/aegisub/src/auto4_lua.cpp b/aegisub/src/auto4_lua.cpp index b5a25dcdf..8d1c6bd18 100644 --- a/aegisub/src/auto4_lua.cpp +++ b/aegisub/src/auto4_lua.cpp @@ -62,6 +62,7 @@ #include "ass_style.h" #include "auto4_lua_factory.h" #include "auto4_lua_scriptreader.h" +#include "compat.h" #include "include/aegisub/context.h" #include "main.h" #include "selection_controller.h" diff --git a/aegisub/src/auto4_lua.h b/aegisub/src/auto4_lua.h index 4ccc9e75c..fd419fced 100644 --- a/aegisub/src/auto4_lua.h +++ b/aegisub/src/auto4_lua.h @@ -41,7 +41,6 @@ #include #endif -#include "compat.h" #include "auto4_base.h" #include "command/command.h" diff --git a/aegisub/src/auto4_lua_dialog.cpp b/aegisub/src/auto4_lua_dialog.cpp index e5ce4336f..884042390 100644 --- a/aegisub/src/auto4_lua_dialog.cpp +++ b/aegisub/src/auto4_lua_dialog.cpp @@ -60,6 +60,7 @@ #include "ass_style.h" #include "colour_button.h" +#include "compat.h" #include "string_codec.h" #include "utils.h" diff --git a/aegisub/src/command/video.cpp b/aegisub/src/command/video.cpp index 0fccea4cc..42455410b 100644 --- a/aegisub/src/command/video.cpp +++ b/aegisub/src/command/video.cpp @@ -62,6 +62,7 @@ #include "../video_box.h" #include "../video_context.h" #include "../video_display.h" +#include "../video_frame.h" #include "../video_slider.h" namespace { diff --git a/aegisub/src/dialog_dummy_video.cpp b/aegisub/src/dialog_dummy_video.cpp index c05152491..d279fc243 100644 --- a/aegisub/src/dialog_dummy_video.cpp +++ b/aegisub/src/dialog_dummy_video.cpp @@ -37,18 +37,33 @@ #include "config.h" +#include "dialog_dummy_video.h" + #ifndef AGI_PRE +#include +#include #include #include #include +#include #include +#include +#include +#include #endif +#include "colour_button.h" #include "compat.h" -#include "dialog_dummy_video.h" #include "help_button.h" #include "main.h" #include "utils.h" +#include "video_provider_dummy.h" + +enum { + Dummy_Video_Resolution_Shortcut = 1700, + Dummy_Video_FPS, + Dummy_Video_Length +}; /// DOCME struct ResolutionShortcut { diff --git a/aegisub/src/dialog_dummy_video.h b/aegisub/src/dialog_dummy_video.h index d3c002cdb..8f902e9e5 100644 --- a/aegisub/src/dialog_dummy_video.h +++ b/aegisub/src/dialog_dummy_video.h @@ -34,22 +34,17 @@ /// @ingroup secondary_ui /// - - - #ifndef AGI_PRE -#include -#include #include -#include -#include -#include -#include #endif -#include "colour_button.h" -#include "video_provider_dummy.h" - +class ColourButton; +class wxButton; +class wxCheckBox; +class wxComboBox; +class wxSpinCtrl; +class wxStaticText; +class wxTextCtrl; /// DOCME /// @class DialogDummyVideo @@ -57,10 +52,8 @@ /// /// DOCME class DialogDummyVideo : public wxDialog { -private: DialogDummyVideo(wxWindow *parent); - virtual ~DialogDummyVideo(); - + ~DialogDummyVideo(); /// DOCME wxComboBox *resolution_shortcuts; @@ -104,15 +97,3 @@ public: DECLARE_EVENT_TABLE() }; - -enum { - - /// DOCME - Dummy_Video_Resolution_Shortcut = 1700, - - /// DOCME - Dummy_Video_FPS, - - /// DOCME - Dummy_Video_Length -}; diff --git a/aegisub/src/dialog_text_import.cpp b/aegisub/src/dialog_text_import.cpp index 15f7479ad..171b4e516 100644 --- a/aegisub/src/dialog_text_import.cpp +++ b/aegisub/src/dialog_text_import.cpp @@ -34,9 +34,6 @@ /// @ingroup secondary_ui /// - -/////////// -// Headers #include "config.h" #ifndef AGI_PRE @@ -48,6 +45,10 @@ #include "dialog_text_import.h" #include "main.h" +enum { + EDIT_ACTOR_SEPARATOR = 1480, + EDIT_COMMENT_STARTER +}; /// @brief Constructor /// diff --git a/aegisub/src/dialog_text_import.h b/aegisub/src/dialog_text_import.h index 42b9a40ec..7704d7d3b 100644 --- a/aegisub/src/dialog_text_import.h +++ b/aegisub/src/dialog_text_import.h @@ -34,10 +34,6 @@ /// @ingroup secondary_ui /// - - -/////////// -// Headers #ifndef AGI_PRE #include #include @@ -67,15 +63,3 @@ public: DECLARE_EVENT_TABLE() }; - - -/////// -// IDs -enum { - - /// DOCME - EDIT_ACTOR_SEPARATOR = 1480, - - /// DOCME - EDIT_COMMENT_STARTER -}; diff --git a/aegisub/src/include/aegisub/video_provider.h b/aegisub/src/include/aegisub/video_provider.h index 5d6f9b72b..e82ae0479 100644 --- a/aegisub/src/include/aegisub/video_provider.h +++ b/aegisub/src/include/aegisub/video_provider.h @@ -36,10 +36,15 @@ #pragma once -#include "video_frame.h" #include #include +#ifndef AGI_PRE +#include +#endif + +class AegiVideoFrame; + /// @class VideoProvider /// @brief DOCME /// diff --git a/aegisub/src/threaded_frame_source.cpp b/aegisub/src/threaded_frame_source.cpp index 6ba6b0196..ffb1d6dc9 100644 --- a/aegisub/src/threaded_frame_source.cpp +++ b/aegisub/src/threaded_frame_source.cpp @@ -47,6 +47,7 @@ #include "compat.h" #include "include/aegisub/context.h" #include "include/aegisub/subtitles_provider.h" +#include "video_frame.h" #include "video_provider_manager.h" // Test if a line is a dialogue line which is not visible at the given time diff --git a/aegisub/src/threaded_frame_source.h b/aegisub/src/threaded_frame_source.h index 90b8c0fa5..e0da9d51b 100644 --- a/aegisub/src/threaded_frame_source.h +++ b/aegisub/src/threaded_frame_source.h @@ -44,8 +44,7 @@ #include #include -#include "video_frame.h" - +class AegiVideoFrame; class AssFile; class SubtitlesProvider; class VideoProvider; diff --git a/aegisub/src/video_provider_avs.h b/aegisub/src/video_provider_avs.h index 04abb35d7..6f49e89c4 100644 --- a/aegisub/src/video_provider_avs.h +++ b/aegisub/src/video_provider_avs.h @@ -38,6 +38,7 @@ #include "avisynth.h" #include "avisynth_wrap.h" #include "include/aegisub/video_provider.h" +#include "video_frame.h" /// DOCME /// @class AvisynthVideoProvider diff --git a/aegisub/src/video_provider_cache.cpp b/aegisub/src/video_provider_cache.cpp index ab7749b74..dd73810ab 100644 --- a/aegisub/src/video_provider_cache.cpp +++ b/aegisub/src/video_provider_cache.cpp @@ -35,10 +35,13 @@ /// #include "config.h" -#include "main.h" #include "video_provider_cache.h" +#include "main.h" +#include "video_frame.h" + + /// DOCME /// @class CachedFrame /// @brief DOCME diff --git a/aegisub/src/video_provider_dummy.h b/aegisub/src/video_provider_dummy.h index 01a424294..484f4a1e3 100644 --- a/aegisub/src/video_provider_dummy.h +++ b/aegisub/src/video_provider_dummy.h @@ -41,6 +41,7 @@ #endif #include "include/aegisub/video_provider.h" +#include "video_frame.h" /// DOCME /// @class DummyVideoProvider diff --git a/aegisub/src/video_provider_ffmpegsource.h b/aegisub/src/video_provider_ffmpegsource.h index 118ffe3b4..4d5b61177 100644 --- a/aegisub/src/video_provider_ffmpegsource.h +++ b/aegisub/src/video_provider_ffmpegsource.h @@ -41,7 +41,7 @@ #include "ffmpegsource_common.h" #include "include/aegisub/video_provider.h" - +#include "video_frame.h" /// @class FFmpegSourceVideoProvider /// @brief Implements video loading through the FFMS library. diff --git a/aegisub/src/video_provider_yuv4mpeg.cpp b/aegisub/src/video_provider_yuv4mpeg.cpp index b7a4f0fb0..108aaff95 100644 --- a/aegisub/src/video_provider_yuv4mpeg.cpp +++ b/aegisub/src/video_provider_yuv4mpeg.cpp @@ -38,9 +38,11 @@ #include +#include "video_provider_yuv4mpeg.h" + #include "compat.h" #include "utils.h" -#include "video_provider_yuv4mpeg.h" +#include "video_frame.h" // All of this cstdio bogus is because of one reason and one reason only: // MICROSOFT'S IMPLEMENTATION OF STD::FSTREAM DOES NOT SUPPORT FILES LARGER THAN 2 GB.