iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Kill config.h and just force-include acconf.h in non-pch builds

This commit is contained in:
Thomas Goyne 2014-04-15 19:33:37 -07:00
parent dcf1270fc4
commit 1d5292fdee
218 changed files with 11 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.target
View File

@ -152,8 +152,8 @@ OBJCXXFLAGS := $(CXXFLAGS)
#################### ####################
# PRECOMPILED HEADER # PRECOMPILED HEADER
#################### ####################
ifeq (yes, $(PRECOMPILED_HEADER)) ifdef PRECOMPILED_HEADER_NAME
ifdef PRECOMPILED_HEADER_NAME ifeq (yes, $(PRECOMPILED_HEADER))
CXXFLAGS += -include $(PRECOMPILED_HEADER_NAME) $(PCHFLAGS) CXXFLAGS += -include $(PRECOMPILED_HEADER_NAME) $(PCHFLAGS)
# This hack is required until we can use the 'private' keyword (gmake 3.82) to avoid all the # This hack is required until we can use the 'private' keyword (gmake 3.82) to avoid all the
# per-object CXXFLAGS being triggered by the ($OBJ) line. # per-object CXXFLAGS being triggered by the ($OBJ) line.
@ -161,6 +161,8 @@ ifeq (yes, $(PRECOMPILED_HEADER))
$(OBJ): | $(PRECOMPILED_HEADER_NAME).gch $(OBJ): | $(PRECOMPILED_HEADER_NAME).gch
$(PRECOMPILED_HEADER_NAME).gch: CXXFLAGS = $(CXXFLAGS_GNU_MAKE_SUCKS) $(PRECOMPILED_HEADER_NAME).gch: CXXFLAGS = $(CXXFLAGS_GNU_MAKE_SUCKS)
$(PRECOMPILED_HEADER_NAME).gch: $(PRECOMPILED_HEADER_NAME) $(PRECOMPILED_HEADER_NAME).gch: $(PRECOMPILED_HEADER_NAME)
else
CXXFLAGS += -include acconf.h
endif endif
endif endif

1
automation/tests/aegisub.cpp
View File

@ -14,7 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"

2
libaegisub/ass/dialogue_parser.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/ass/dialogue_parser.h" #include "libaegisub/ass/dialogue_parser.h"
#include "libaegisub/spellchecker.h" #include "libaegisub/spellchecker.h"

4
libaegisub/common/cajun/elements.cpp
View File

@ -5,8 +5,6 @@ Project Webpage: http://cajun-jsonapi.sourceforge.net/
Author: Terry Caton Author: Terry Caton
***********************************************/ ***********************************************/
#include "../../config.h"
#include "libaegisub/cajun/elements.h" #include "libaegisub/cajun/elements.h"
#include "libaegisub/cajun/visitor.h" #include "libaegisub/cajun/visitor.h"
@ -62,7 +60,6 @@ public:
virtual void Accept(Visitor& visitor) = 0; virtual void Accept(Visitor& visitor) = 0;
}; };
template <typename ElementTypeT> template <typename ElementTypeT>
class UnknownElement::Imp_T final : public UnknownElement::Imp class UnknownElement::Imp_T final : public UnknownElement::Imp
{ {
@ -155,7 +152,6 @@ ElementTypeT& UnknownElement::CastTo()
void UnknownElement::Accept(ConstVisitor& visitor) const { m_pImp->Accept(visitor); } void UnknownElement::Accept(ConstVisitor& visitor) const { m_pImp->Accept(visitor); }
void UnknownElement::Accept(Visitor& visitor) { m_pImp->Accept(visitor); } void UnknownElement::Accept(Visitor& visitor) { m_pImp->Accept(visitor); }
bool UnknownElement::operator == (const UnknownElement& element) const bool UnknownElement::operator == (const UnknownElement& element) const
{ {
return m_pImp->Compare(*element.m_pImp); return m_pImp->Compare(*element.m_pImp);

1
libaegisub/common/cajun/reader.cpp
View File

@ -192,7 +192,6 @@ void Reader::Scan(Tokens& tokens, InputStream& inputStream) {
} }
} }
void Reader::EatWhiteSpace(InputStream& inputStream) { void Reader::EatWhiteSpace(InputStream& inputStream) {
while (!inputStream.EOS() && ::isspace(inputStream.Peek())) while (!inputStream.EOS() && ::isspace(inputStream.Peek()))
inputStream.Get(); inputStream.Get();

2
libaegisub/common/calltip_provider.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/calltip_provider.h" #include "libaegisub/calltip_provider.h"
#include "libaegisub/ass/dialogue_parser.h" #include "libaegisub/ass/dialogue_parser.h"

2
libaegisub/common/charset_6937.cpp
View File

@ -16,8 +16,6 @@
/// @brief A charset converter for ISO-6937-2 /// @brief A charset converter for ISO-6937-2
/// @ingroup libaegisub /// @ingroup libaegisub
#include "../config.h"
#include "charset_6937.h" #include "charset_6937.h"
#include <algorithm> #include <algorithm>

4
libaegisub/common/charset_conv.cpp
View File

@ -22,8 +22,6 @@
#include <cassert> #include <cassert>
#include <map> #include <map>
#include "../config.h"
#include <libaegisub/charset_conv.h> #include <libaegisub/charset_conv.h>
#include <iconv.h> #include <iconv.h>
@ -312,7 +310,7 @@ void IconvWrapper::Convert(const char *src, size_t srcLen, std::string &dest) {
dest.append(buff, sizeof(buff) - dstLen); dest.append(buff, sizeof(buff) - dstLen);
} while (res == iconv_failed && errno == E2BIG); } while (res == iconv_failed && errno == E2BIG);
if (res == iconv_failed) { if (res == iconv_failed) {
switch (errno) { switch (errno) {
case EINVAL: case EINVAL:

2
libaegisub/common/color.cpp
View File

@ -12,8 +12,6 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "../config.h"
#include "libaegisub/color.h" #include "libaegisub/color.h"
#include "parser.h" #include "parser.h"

2
libaegisub/common/dispatch.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/dispatch.h" #include "libaegisub/dispatch.h"
#include "libaegisub/util.h" #include "libaegisub/util.h"

2
libaegisub/common/file_mapping.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/file_mapping.h" #include "libaegisub/file_mapping.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"

2
libaegisub/common/fs.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"
#include "libaegisub/access.h" #include "libaegisub/access.h"

2
libaegisub/common/hotkey.cpp
View File

@ -16,8 +16,6 @@
/// @brief Hotkey handler /// @brief Hotkey handler
/// @ingroup hotkey menu event window /// @ingroup hotkey menu event window
#include "../config.h"
#include "libaegisub/hotkey.h" #include "libaegisub/hotkey.h"
#include "libaegisub/cajun/writer.h" #include "libaegisub/cajun/writer.h"

2
libaegisub/common/json.cpp
View File

@ -16,8 +16,6 @@
/// @brief Parse JSON files and return json::UnknownElement /// @brief Parse JSON files and return json::UnknownElement
/// @ingroup libaegisub io /// @ingroup libaegisub io
#include "../config.h"
#include "libaegisub/json.h" #include "libaegisub/json.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"

2
libaegisub/common/kana_table.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/kana_table.h" #include "libaegisub/kana_table.h"
#include <boost/range/algorithm.hpp> #include <boost/range/algorithm.hpp>

2
libaegisub/common/karaoke_matcher.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/karaoke_matcher.h" #include "libaegisub/karaoke_matcher.h"
#include "libaegisub/kana_table.h" #include "libaegisub/kana_table.h"

2
libaegisub/common/keyframe.cpp
View File

@ -17,8 +17,6 @@
/// @ingroup libaegisub /// @ingroup libaegisub
/// ///
#include "../config.h"
#include "libaegisub/keyframe.h" #include "libaegisub/keyframe.h"
#include <algorithm> #include <algorithm>

2
libaegisub/common/log.cpp
View File

@ -16,8 +16,6 @@
/// @brief Logging /// @brief Logging
/// @ingroup libaegisub /// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/log.h" #include "libaegisub/log.h"
#include "libaegisub/cajun/elements.h" #include "libaegisub/cajun/elements.h"

2
libaegisub/common/mru.cpp
View File

@ -16,8 +16,6 @@
/// @brief Most Recently Used (MRU) Lists /// @brief Most Recently Used (MRU) Lists
/// @ingroup libaegisub /// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/mru.h" #include "libaegisub/mru.h"
#include "libaegisub/cajun/writer.h" #include "libaegisub/cajun/writer.h"

2
libaegisub/common/option.cpp
View File

@ -16,8 +16,6 @@
/// @brief Option interface. /// @brief Option interface.
/// @ingroup libaegisub /// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/option.h" #include "libaegisub/option.h"
#include "libaegisub/cajun/reader.h" #include "libaegisub/cajun/reader.h"

2
libaegisub/common/option_visit.cpp
View File

@ -17,8 +17,6 @@
/// @see option_visit.h /// @see option_visit.h
/// @ingroup libaegisub /// @ingroup libaegisub
#include "../config.h"
#include "option_visit.h" #include "option_visit.h"
#include <cassert> #include <cassert>

2
libaegisub/common/parser.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "parser.h" #include "parser.h"
#include "libaegisub/color.h" #include "libaegisub/color.h"

2
libaegisub/common/path.cpp
View File

@ -18,8 +18,6 @@
/// @brief Platform-independent path code /// @brief Platform-independent path code
/// @ingroup libaegisub /// @ingroup libaegisub
#include "../config.h"
#include "libaegisub/path.h" #include "libaegisub/path.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"

2
libaegisub/common/util.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "libaegisub/util.h" #include "libaegisub/util.h"
#include "libaegisub/util_osx.h" #include "libaegisub/util_osx.h"

2
libaegisub/common/vfr.cpp
View File

@ -16,8 +16,6 @@
/// @brief Framerate handling of all sorts /// @brief Framerate handling of all sorts
/// @ingroup libaegisub video_input /// @ingroup libaegisub video_input
#include "../config.h"
#include "libaegisub/vfr.h" #include "libaegisub/vfr.h"
#include "libaegisub/charset.h" #include "libaegisub/charset.h"

9
libaegisub/config.h
View File

@ -1,9 +0,0 @@
#ifdef _WIN32 // Windows specific settings
#define HAVE_PTHREAD 1
#else
// Generated by configure.in
#include "../acconf.h"
#endif // _WIN32

4
libaegisub/lagi_pre.h
View File

@ -1,4 +1,6 @@
#include "config.h" #ifndef _WIN32
#include "../acconf.h"
#endif
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN

2
libaegisub/osx/util.mm
View File

@ -16,8 +16,6 @@
/// @brief OSX Utilities /// @brief OSX Utilities
/// @ingroup libosxutil osx /// @ingroup libosxutil osx
#include "config.h"
#include "libaegisub/util_osx.h" #include "libaegisub/util_osx.h"
#import <ApplicationServices/ApplicationServices.h> #import <ApplicationServices/ApplicationServices.h>

2
libaegisub/unix/access.cpp
View File

@ -16,8 +16,6 @@
/// @brief Unix access methods. /// @brief Unix access methods.
/// @ingroup libaegisub unix /// @ingroup libaegisub unix
#include "config.h"
#include "libaegisub/access.h" #include "libaegisub/access.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"

2
libaegisub/unix/fs.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/access.h" #include "libaegisub/access.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"
#include "libaegisub/io.h" #include "libaegisub/io.h"

2
libaegisub/unix/log.cpp
View File

@ -16,8 +16,6 @@
/// @brief Unix logging /// @brief Unix logging
/// @ingroup libaegisub /// @ingroup libaegisub
#include "config.h"
#include <cstdio> #include <cstdio>
#include <ctime> #include <ctime>
#include <cstring> #include <cstring>

2
libaegisub/unix/util.cpp
View File

@ -16,8 +16,6 @@
/// @brief Unix utility methods. /// @brief Unix utility methods.
/// @ingroup libaegisub unix /// @ingroup libaegisub unix
#include "config.h"
#include "libaegisub/util.h" #include "libaegisub/util.h"
#include <boost/thread.hpp> #include <boost/thread.hpp>

1
libaegisub/windows/access.cpp
View File

@ -16,7 +16,6 @@
/// @brief Windows access methods. /// @brief Windows access methods.
/// @ingroup libaegisub windows /// @ingroup libaegisub windows
#include <libaegisub/access.h> #include <libaegisub/access.h>
#include <libaegisub/fs.h> #include <libaegisub/fs.h>

2
libaegisub/windows/fs.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "libaegisub/fs.h" #include "libaegisub/fs.h"
#include "libaegisub/access.h" #include "libaegisub/access.h"

2
libaegisub/windows/util_win.cpp
View File

@ -16,8 +16,6 @@
/// @brief Windows utility methods. /// @brief Windows utility methods.
/// @ingroup libaegisub windows /// @ingroup libaegisub windows
#include "../config.h"
#include "libaegisub/util.h" #include "libaegisub/util.h"
#include "libaegisub/charset_conv_win.h" #include "libaegisub/charset_conv_win.h"

2
src/aegisublocale.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup utility /// @ingroup utility
/// ///
#include "config.h"
#include "aegisublocale.h" #include "aegisublocale.h"
#include "options.h" #include "options.h"

1
src/agi_pre.cpp
View File

@ -32,7 +32,6 @@
/// @ingroup main /// @ingroup main
/// ///
// //
// Precompiled Header Source File for MSVC // Precompiled Header Source File for MSVC
// //

2
src/agi_pre.h
View File

@ -49,8 +49,6 @@
// Ensure we get a consistent SDK with VS2012 + Win8 SDK // Ensure we get a consistent SDK with VS2012 + Win8 SDK
#define _USING_V110_SDK71_ 1 #define _USING_V110_SDK71_ 1
#include "config.h"
#include "../libaegisub/lagi_pre.h" #include "../libaegisub/lagi_pre.h"
// General headers // General headers

2
src/ass_attachment.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "ass_attachment.h" #include "ass_attachment.h"
#include <libaegisub/ass/uuencode.h> #include <libaegisub/ass/uuencode.h>

2
src/ass_dialogue.cpp
View File

@ -31,8 +31,6 @@
/// @brief Class for dialogue lines in subtitles /// @brief Class for dialogue lines in subtitles
/// @ingroup subs_storage /// @ingroup subs_storage
#include "config.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "subtitle_format.h" #include "subtitle_format.h"
#include "utils.h" #include "utils.h"

2
src/ass_entry.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup subs_storage /// @ingroup subs_storage
/// ///
#include "config.h"
#include "ass_entry.h" #include "ass_entry.h"
std::string const& AssEntry::GroupHeader(bool ssa) const { std::string const& AssEntry::GroupHeader(bool ssa) const {

2
src/ass_export_filter.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup export /// @ingroup export
/// ///
#include "config.h"
#include "ass_export_filter.h" #include "ass_export_filter.h"
#include <boost/format.hpp> #include <boost/format.hpp>

2
src/ass_exporter.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup export /// @ingroup export
/// ///
#include "config.h"
#include "ass_exporter.h" #include "ass_exporter.h"
#include "ass_export_filter.h" #include "ass_export_filter.h"

2
src/ass_file.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_attachment.h" #include "ass_attachment.h"

3
src/ass_karaoke.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup subs_storage /// @ingroup subs_storage
/// ///
#include "config.h"
#include "ass_karaoke.h" #include "ass_karaoke.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
@ -49,7 +47,6 @@ std::string AssKaraoke::Syllable::GetText(bool k_tag) const {
return ret; return ret;
} }
AssKaraoke::AssKaraoke(AssDialogue *line, bool auto_split, bool normalize) { AssKaraoke::AssKaraoke(AssDialogue *line, bool auto_split, bool normalize) {
if (line) SetLine(line, auto_split, normalize); if (line) SetLine(line, auto_split, normalize);
} }

2
src/ass_override.cpp
View File

@ -33,8 +33,6 @@
/// @ingroup subs_storage /// @ingroup subs_storage
/// ///
#include "config.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "utils.h" #include "utils.h"

2
src/ass_parser.cpp
View File

@ -12,8 +12,6 @@
// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "config.h"
#include "ass_parser.h" #include "ass_parser.h"
#include "ass_attachment.h" #include "ass_attachment.h"

2
src/ass_style.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup subs_storage /// @ingroup subs_storage
/// ///
#include "config.h"
#include "ass_style.h" #include "ass_style.h"
#include "subtitle_format.h" #include "subtitle_format.h"

2
src/ass_style_storage.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup style_editor /// @ingroup style_editor
/// ///
#include "config.h"
#include "ass_style_storage.h" #include "ass_style_storage.h"
#include "ass_style.h" #include "ass_style.h"

2
src/ass_time.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup subs_storage /// @ingroup subs_storage
/// ///
#include "config.h"
#include "ass_time.h" #include "ass_time.h"
#include "utils.h" #include "utils.h"

2
src/audio_box.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_ui /// @ingroup audio_ui
/// ///
#include "config.h"
#include <cmath> #include <cmath>
#include <wx/bmpbuttn.h> #include <wx/bmpbuttn.h>

2
src/audio_colorscheme.cpp
View File

@ -32,8 +32,6 @@
/// ///
/// Manage colour schemes for the audio display /// Manage colour schemes for the audio display
#include "config.h"
#include <algorithm> #include <algorithm>
#include "audio_colorscheme.h" #include "audio_colorscheme.h"

10
src/audio_controller.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_ui /// @ingroup audio_ui
/// ///
#include "config.h"
#include "audio_controller.h" #include "audio_controller.h"
#include "ass_file.h" #include "ass_file.h"
@ -150,7 +148,6 @@ void AudioController::OnAudioProviderChanged()
OpenAudio(agi::fs::path(audio_url)); OpenAudio(agi::fs::path(audio_url));
} }
void AudioController::OpenAudio(agi::fs::path const& url) void AudioController::OpenAudio(agi::fs::path const& url)
{ {
if (url.empty()) if (url.empty())
@ -214,7 +211,6 @@ void AudioController::CloseAudio()
AnnounceAudioClose(); AnnounceAudioClose();
} }
bool AudioController::IsAudioOpen() const bool AudioController::IsAudioOpen() const
{ {
return player && provider; return player && provider;
@ -258,7 +254,6 @@ void AudioController::PlayRange(const TimeRange &range)
AnnouncePlaybackPosition(range.begin()); AnnouncePlaybackPosition(range.begin());
} }
void AudioController::PlayPrimaryRange() void AudioController::PlayPrimaryRange()
{ {
PlayRange(GetPrimaryPlaybackRange()); PlayRange(GetPrimaryPlaybackRange());
@ -287,7 +282,6 @@ void AudioController::PlayToEnd(int start_ms)
AnnouncePlaybackPosition(start_ms); AnnouncePlaybackPosition(start_ms);
} }
void AudioController::Stop() void AudioController::Stop()
{ {
if (!IsAudioOpen()) return; if (!IsAudioOpen()) return;
@ -299,13 +293,11 @@ void AudioController::Stop()
AnnouncePlaybackStop(); AnnouncePlaybackStop();
} }
bool AudioController::IsPlaying() bool AudioController::IsPlaying()
{ {
return IsAudioOpen() && playback_mode != PM_NotPlaying; return IsAudioOpen() && playback_mode != PM_NotPlaying;
} }
int AudioController::GetPlaybackPosition() int AudioController::GetPlaybackPosition()
{ {
if (!IsPlaying()) return 0; if (!IsPlaying()) return 0;
@ -338,7 +330,6 @@ void AudioController::SetVolume(double volume)
player->SetVolume(volume); player->SetVolume(volume);
} }
int64_t AudioController::SamplesFromMilliseconds(int64_t ms) const int64_t AudioController::SamplesFromMilliseconds(int64_t ms) const
{ {
/// @todo There might be some subtle rounding errors here. /// @todo There might be some subtle rounding errors here.
@ -352,7 +343,6 @@ int64_t AudioController::SamplesFromMilliseconds(int64_t ms) const
return (millisamples + 999) / 1000; return (millisamples + 999) / 1000;
} }
int64_t AudioController::MillisecondsFromSamples(int64_t samples) const int64_t AudioController::MillisecondsFromSamples(int64_t samples) const
{ {
/// @todo There might be some subtle rounding errors here. /// @todo There might be some subtle rounding errors here.

4
src/audio_display.cpp
View File

@ -33,8 +33,6 @@
/// @ingroup audio_ui /// @ingroup audio_ui
/// ///
#include "config.h"
#include "audio_display.h" #include "audio_display.h"
#include "ass_time.h" #include "ass_time.h"
@ -246,7 +244,6 @@ public:
const int AudioDisplayScrollbar::min_width; const int AudioDisplayScrollbar::min_width;
class AudioDisplayTimeline final : public AudioDisplayInteractionObject { class AudioDisplayTimeline final : public AudioDisplayInteractionObject {
int duration; ///< Total duration in ms int duration; ///< Total duration in ms
double ms_per_pixel; ///< Milliseconds per pixel double ms_per_pixel; ///< Milliseconds per pixel
@ -940,7 +937,6 @@ void AudioDisplay::SetDraggedObject(AudioDisplayInteractionObject *new_obj)
audio_marker.reset(); audio_marker.reset();
} }
void AudioDisplay::SetTrackCursor(int new_pos, bool show_time) void AudioDisplay::SetTrackCursor(int new_pos, bool show_time)
{ {
if (new_pos == track_cursor_pos) return; if (new_pos == track_cursor_pos) return;

2
src/audio_karaoke.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup audio_ui /// @ingroup audio_ui
/// ///
#include "config.h"
#include "audio_karaoke.h" #include "audio_karaoke.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"

2
src/audio_marker.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup audio_ui /// @ingroup audio_ui
/// ///
#include "config.h"
#include "audio_marker.h" #include "audio_marker.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"

2
src/audio_player.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
#include "audio_controller.h" #include "audio_controller.h"

4
src/audio_player_alsa.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_ALSA #ifdef WITH_ALSA
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
@ -250,7 +248,7 @@ do_setup:
{ {
int64_t orig_position = position; int64_t orig_position = position;
int64_t orig_ps_end_position = ps.end_position; int64_t orig_ps_end_position = ps.end_position;
ScopedAliveFlag playing_flag(ps.playing); ScopedAliveFlag playing_flag(ps.playing);
// Sleep a bit, or until an event // Sleep a bit, or until an event

3
src/audio_player_dsound.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_DIRECTSOUND #ifdef WITH_DIRECTSOUND
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
@ -374,4 +372,3 @@ std::unique_ptr<AudioPlayer> CreateDirectSoundPlayer(AudioProvider *provider, wx
} }
#endif // WITH_DIRECTSOUND #endif // WITH_DIRECTSOUND

5
src/audio_player_dsound2.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_DIRECTSOUND #ifdef WITH_DIRECTSOUND
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
@ -234,14 +232,12 @@ class DirectSoundPlayer2Thread {
/// Audio frame to end playback at /// Audio frame to end playback at
int64_t end_frame = 0; int64_t end_frame = 0;
/// Desired length in milliseconds to write ahead of the playback cursor /// Desired length in milliseconds to write ahead of the playback cursor
int wanted_latency; int wanted_latency;
/// Multiplier for WantedLatency to get total buffer length /// Multiplier for WantedLatency to get total buffer length
int buffer_length; int buffer_length;
/// System millisecond timestamp of last playback start, used to calculate playback position /// System millisecond timestamp of last playback start, used to calculate playback position
DWORD last_playback_restart; DWORD last_playback_restart;
@ -364,7 +360,6 @@ void DirectSoundPlayer2Thread::Run()
//wx Log Debug("DirectSoundPlayer2: Created buffer of %d bytes, supposed to be %d milliseconds or %d frames", bufSize, WANTED_LATENCY*BUFFER_LENGTH, bufSize/provider->GetBytesPerSample()); //wx Log Debug("DirectSoundPlayer2: Created buffer of %d bytes, supposed to be %d milliseconds or %d frames", bufSize, WANTED_LATENCY*BUFFER_LENGTH, bufSize/provider->GetBytesPerSample());
// Now we're ready to roll! // Now we're ready to roll!
SetEvent(thread_running); SetEvent(thread_running);
bool running = true; bool running = true;

2
src/audio_player_openal.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_OPENAL #ifdef WITH_OPENAL
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"

3
src/audio_player_oss.cpp
View File

@ -30,8 +30,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_OSS #ifdef WITH_OSS
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"
@ -103,7 +101,6 @@ public:
::close(dspdev); ::close(dspdev);
} }
void Play(int64_t start, int64_t count); void Play(int64_t start, int64_t count);
void Stop(); void Stop();
bool IsPlaying() { return playing; } bool IsPlaying() { return playing; }

2
src/audio_player_portaudio.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_PORTAUDIO #ifdef WITH_PORTAUDIO
#include "audio_player_portaudio.h" #include "audio_player_portaudio.h"

2
src/audio_player_pulse.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_output /// @ingroup audio_output
/// ///
#include "config.h"
#ifdef WITH_LIBPULSE #ifdef WITH_LIBPULSE
#include "include/aegisub/audio_player.h" #include "include/aegisub/audio_player.h"

2
src/audio_provider.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_input /// @ingroup audio_input
/// ///
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "audio_controller.h" #include "audio_controller.h"

2
src/audio_provider_avs.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_input /// @ingroup audio_input
/// ///
#include "config.h"
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"

2
src/audio_provider_convert.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup audio_input /// @ingroup audio_input
/// ///
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "audio_controller.h" #include "audio_controller.h"

2
src/audio_provider_dummy.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_input /// @ingroup audio_input
/// ///
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include <libaegisub/fs.h> #include <libaegisub/fs.h>

2
src/audio_provider_ffmpegsource.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_input ffms /// @ingroup audio_input ffms
/// ///
#include "config.h"
#ifdef WITH_FFMS2 #ifdef WITH_FFMS2
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"

2
src/audio_provider_hd.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "audio_controller.h" #include "audio_controller.h"

2
src/audio_provider_lock.cpp
View File

@ -16,8 +16,6 @@
/// @brief An audio provider adapter for un-threadsafe audio providers /// @brief An audio provider adapter for un-threadsafe audio providers
/// @ingroup audio_input /// @ingroup audio_input
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include <libaegisub/util.h> #include <libaegisub/util.h>

2
src/audio_provider_pcm.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_input /// @ingroup audio_input
/// ///
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "audio_controller.h" #include "audio_controller.h"

2
src/audio_provider_ram.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup audio_input /// @ingroup audio_input
/// ///
#include "config.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
#include "audio_controller.h" #include "audio_controller.h"

15
src/audio_renderer.cpp
View File

@ -31,8 +31,6 @@
/// @brief Base classes for audio renderers (spectrum, waveform, ...) /// @brief Base classes for audio renderers (spectrum, waveform, ...)
/// @ingroup audio_ui /// @ingroup audio_ui
#include "config.h"
#include "audio_renderer.h" #include "audio_renderer.h"
#include "include/aegisub/audio_provider.h" #include "include/aegisub/audio_provider.h"
@ -61,7 +59,6 @@ size_t AudioRendererBitmapCacheBitmapFactory::GetBlockSize() const
return sizeof(wxBitmap) + renderer->cache_bitmap_width * renderer->pixel_height * 3; return sizeof(wxBitmap) + renderer->cache_bitmap_width * renderer->pixel_height * 3;
} }
AudioRenderer::AudioRenderer() AudioRenderer::AudioRenderer()
{ {
for (int i = 0; i < AudioStyle_MAX; ++i) for (int i = 0; i < AudioStyle_MAX; ++i)
@ -84,7 +81,6 @@ void AudioRenderer::SetMillisecondsPerPixel(double new_pixel_ms)
ResetBlockCount(); ResetBlockCount();
} }
void AudioRenderer::SetHeight(int _pixel_height) void AudioRenderer::SetHeight(int _pixel_height)
{ {
if (pixel_height == _pixel_height) return; if (pixel_height == _pixel_height) return;
@ -93,7 +89,6 @@ void AudioRenderer::SetHeight(int _pixel_height)
Invalidate(); Invalidate();
} }
void AudioRenderer::SetAmplitudeScale(float _amplitude_scale) void AudioRenderer::SetAmplitudeScale(float _amplitude_scale)
{ {
if (amplitude_scale == _amplitude_scale) return; if (amplitude_scale == _amplitude_scale) return;
@ -108,7 +103,6 @@ void AudioRenderer::SetAmplitudeScale(float _amplitude_scale)
Invalidate(); Invalidate();
} }
void AudioRenderer::SetRenderer(AudioRendererBitmapProvider *_renderer) void AudioRenderer::SetRenderer(AudioRendererBitmapProvider *_renderer)
{ {
if (renderer == _renderer) return; if (renderer == _renderer) return;
@ -124,7 +118,6 @@ void AudioRenderer::SetRenderer(AudioRendererBitmapProvider *_renderer)
} }
} }
void AudioRenderer::SetAudioProvider(AudioProvider *_provider) void AudioRenderer::SetAudioProvider(AudioProvider *_provider)
{ {
if (provider == _provider) return; if (provider == _provider) return;
@ -138,7 +131,6 @@ void AudioRenderer::SetAudioProvider(AudioProvider *_provider)
ResetBlockCount(); ResetBlockCount();
} }
void AudioRenderer::SetCacheMaxSize(size_t max_size) void AudioRenderer::SetCacheMaxSize(size_t max_size)
{ {
// Limit the bitmap cache sizes to 16 MB hard, to avoid the risk of exhausting // Limit the bitmap cache sizes to 16 MB hard, to avoid the risk of exhausting
@ -149,7 +141,6 @@ void AudioRenderer::SetCacheMaxSize(size_t max_size)
cache_renderer_maxsize = max_size - 4*cache_bitmap_maxsize; cache_renderer_maxsize = max_size - 4*cache_bitmap_maxsize;
} }
void AudioRenderer::ResetBlockCount() void AudioRenderer::ResetBlockCount()
{ {
if (provider) if (provider)
@ -161,7 +152,6 @@ void AudioRenderer::ResetBlockCount()
} }
} }
const wxBitmap *AudioRenderer::GetCachedBitmap(int i, AudioRenderingStyle style) const wxBitmap *AudioRenderer::GetCachedBitmap(int i, AudioRenderingStyle style)
{ {
assert(provider); assert(provider);
@ -180,7 +170,6 @@ const wxBitmap *AudioRenderer::GetCachedBitmap(int i, AudioRenderingStyle style)
return bmp; return bmp;
} }
void AudioRenderer::Render(wxDC &dc, wxPoint origin, int start, int length, AudioRenderingStyle style) void AudioRenderer::Render(wxDC &dc, wxPoint origin, int start, int length, AudioRenderingStyle style)
{ {
assert(start >= 0); assert(start >= 0);
@ -225,14 +214,12 @@ void AudioRenderer::Render(wxDC &dc, wxPoint origin, int start, int length, Audi
} }
} }
void AudioRenderer::Invalidate() void AudioRenderer::Invalidate()
{ {
for (auto& bmp : bitmaps) bmp.Age(0); for (auto& bmp : bitmaps) bmp.Age(0);
needs_age = false; needs_age = false;
} }
void AudioRendererBitmapProvider::SetProvider(AudioProvider *_provider) void AudioRendererBitmapProvider::SetProvider(AudioProvider *_provider)
{ {
if (provider == _provider) return; if (provider == _provider) return;
@ -242,7 +229,6 @@ void AudioRendererBitmapProvider::SetProvider(AudioProvider *_provider)
OnSetProvider(); OnSetProvider();
} }
void AudioRendererBitmapProvider::SetMillisecondsPerPixel(double new_pixel_ms) void AudioRendererBitmapProvider::SetMillisecondsPerPixel(double new_pixel_ms)
{ {
if (pixel_ms == new_pixel_ms) return; if (pixel_ms == new_pixel_ms) return;
@ -252,7 +238,6 @@ void AudioRendererBitmapProvider::SetMillisecondsPerPixel(double new_pixel_ms)
OnSetMillisecondsPerPixel(); OnSetMillisecondsPerPixel();
} }
void AudioRendererBitmapProvider::SetAmplitudeScale(float _amplitude_scale) void AudioRendererBitmapProvider::SetAmplitudeScale(float _amplitude_scale)
{ {
if (amplitude_scale == _amplitude_scale) return; if (amplitude_scale == _amplitude_scale) return;

4
src/audio_renderer_spectrum.cpp
View File

@ -32,8 +32,6 @@
/// @brief Caching frequency-power spectrum renderer for audio display /// @brief Caching frequency-power spectrum renderer for audio display
/// @ingroup audio_ui /// @ingroup audio_ui
#include "config.h"
#include "audio_renderer_spectrum.h" #include "audio_renderer_spectrum.h"
#include "audio_colorscheme.h" #include "audio_colorscheme.h"
@ -83,7 +81,6 @@ struct AudioSpectrumCacheBlockFactory {
} }
}; };
/// @brief Cache for audio spectrum frequency-power data /// @brief Cache for audio spectrum frequency-power data
class AudioSpectrumCache class AudioSpectrumCache
: public DataBlockCache<float, 10, AudioSpectrumCacheBlockFactory> { : public DataBlockCache<float, 10, AudioSpectrumCacheBlockFactory> {
@ -95,7 +92,6 @@ public:
} }
}; };
AudioSpectrumRenderer::AudioSpectrumRenderer(std::string const& color_scheme_name) AudioSpectrumRenderer::AudioSpectrumRenderer(std::string const& color_scheme_name)
{ {
colors.reserve(AudioStyle_MAX); colors.reserve(AudioStyle_MAX);

4
src/audio_renderer_waveform.cpp
View File

@ -32,8 +32,6 @@
/// ///
/// Render a waveform display of PCM audio data /// Render a waveform display of PCM audio data
#include "config.h"
#include "audio_renderer_waveform.h" #include "audio_renderer_waveform.h"
#include <algorithm> #include <algorithm>
@ -67,7 +65,6 @@ AudioWaveformRenderer::~AudioWaveformRenderer()
delete[] audio_buffer; delete[] audio_buffer;
} }
void AudioWaveformRenderer::Render(wxBitmap &bmp, int start, AudioRenderingStyle style) void AudioWaveformRenderer::Render(wxBitmap &bmp, int start, AudioRenderingStyle style)
{ {
wxMemoryDC dc(bmp); wxMemoryDC dc(bmp);
@ -144,7 +141,6 @@ void AudioWaveformRenderer::Render(wxBitmap &bmp, int start, AudioRenderingStyle
dc.DrawLine(0, midpoint, rect.width, midpoint); dc.DrawLine(0, midpoint, rect.width, midpoint);
} }
void AudioWaveformRenderer::RenderBlank(wxDC &dc, const wxRect &rect, AudioRenderingStyle style) void AudioWaveformRenderer::RenderBlank(wxDC &dc, const wxRect &rect, AudioRenderingStyle style)
{ {
const AudioColorScheme *pal = &colors[style]; const AudioColorScheme *pal = &colors[style];

2
src/audio_timing_dialogue.cpp
View File

@ -31,8 +31,6 @@
/// @brief Default timing mode for dialogue subtitles /// @brief Default timing mode for dialogue subtitles
/// @ingroup audio_ui /// @ingroup audio_ui
#include "config.h"
#include "ass_dialogue.h" #include "ass_dialogue.h"
#include "ass_file.h" #include "ass_file.h"
#include "ass_time.h" #include "ass_time.h"

2
src/audio_timing_karaoke.cpp
View File

@ -19,8 +19,6 @@
/// @ingroup audio_ui /// @ingroup audio_ui
/// ///
#include "config.h"
#include <libaegisub/signal.h> #include <libaegisub/signal.h>
#include "ass_dialogue.h" #include "ass_dialogue.h"

2
src/auto4_base.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup scripting /// @ingroup scripting
/// ///
#include "config.h"
#include "auto4_base.h" #include "auto4_base.h"
#include "ass_file.h" #include "ass_file.h"

2
src/auto4_lua.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup scripting /// @ingroup scripting
/// ///
#include "config.h"
#include "auto4_lua.h" #include "auto4_lua.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"

2
src/auto4_lua_assfile.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup scripting /// @ingroup scripting
/// ///
#include "config.h"
#include "auto4_lua.h" #include "auto4_lua.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"

3
src/auto4_lua_dialog.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup scripting /// @ingroup scripting
/// ///
#include "config.h"
#include "auto4_lua.h" #include "auto4_lua.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"
@ -234,7 +232,6 @@ namespace Automation4 {
} }
}; };
/// Integer only edit /// Integer only edit
class IntEdit final : public Edit { class IntEdit final : public Edit {
wxSpinCtrl *cw; wxSpinCtrl *cw;

2
src/auto4_lua_progresssink.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup scripting /// @ingroup scripting
/// ///
#include "config.h"
#include "auto4_lua.h" #include "auto4_lua.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"

2
src/auto4_lua_scriptreader.cpp
View File

@ -17,8 +17,6 @@
/// @ingroup scripting /// @ingroup scripting
/// ///
#include "config.h"
#include "auto4_lua_scriptreader.h" #include "auto4_lua_scriptreader.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"

2
src/auto4_regex.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "auto4_lua_utils.h" #include "auto4_lua_utils.h"
#include <boost/regex/icu.hpp> #include <boost/regex/icu.hpp>

2
src/avisynth_wrap.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup video_input audio_input /// @ingroup video_input audio_input
/// ///
#include "config.h"
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
#include "avisynth_wrap.h" #include "avisynth_wrap.h"

2
src/base_grid.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup main_ui /// @ingroup main_ui
/// ///
#include "config.h"
#include "base_grid.h" #include "base_grid.h"
#include "include/aegisub/context.h" #include "include/aegisub/context.h"

3
src/charset_detect.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup utility /// @ingroup utility
/// ///
#include "config.h"
#include "charset_detect.h" #include "charset_detect.h"
#include "compat.h" #include "compat.h"
@ -89,4 +87,3 @@ std::string GetEncoding(agi::fs::path const& filename) {
} }
} }

2
src/colorspace.cpp
View File

@ -32,8 +32,6 @@
/// @ingroup utility /// @ingroup utility
/// ///
#include "config.h"
#include "colorspace.h" #include "colorspace.h"
#include "utils.h" #include "utils.h"

2
src/colour_button.cpp
View File

@ -14,8 +14,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "config.h"
#include "colour_button.h" #include "colour_button.h"
#include "compat.h" #include "compat.h"

2
src/command/app.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include "command.h" #include "command.h"

2
src/command/audio.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"

2
src/command/automation.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../auto4_base.h" #include "../auto4_base.h"

2
src/command/edit.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"

2
src/command/grid.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"

2
src/command/help.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../help_button.h" #include "../help_button.h"

2
src/command/keyframe.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../include/aegisub/context.h" #include "../include/aegisub/context.h"

2
src/command/recent.cpp
View File

@ -27,8 +27,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../audio_controller.h" #include "../audio_controller.h"

2
src/command/subtitle.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"

2
src/command/time.cpp
View File

@ -29,8 +29,6 @@
// //
// Aegisub Project http://www.aegisub.org/ // Aegisub Project http://www.aegisub.org/
#include "../config.h"
#include "command.h" #include "command.h"
#include "../ass_dialogue.h" #include "../ass_dialogue.h"

Some files were not shown because too many files have changed in this diff Show More