From 1afa7566abe46dc8788da8401640770602172b95 Mon Sep 17 00:00:00 2001
From: Rodrigo Braz Monteiro <zeratul@cellosoft.com>
Date: Tue, 22 Jan 2008 02:54:16 +0000
Subject: [PATCH] Originally committed to SVN as r1812.
---
aegisub/audio_provider_avs.cpp | 2 +-
aegisub/avisynth_wrap.cpp | 4 ++--
aegisub/frame_main.cpp | 4 +++-
aegisub/video_provider_avs.cpp | 2 +-
aegisub/win32/config0.h | 5 +++++
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/aegisub/audio_provider_avs.cpp b/aegisub/audio_provider_avs.cpp
index a0a8df7c4..2643e5462 100644
--- a/aegisub/audio_provider_avs.cpp
+++ b/aegisub/audio_provider_avs.cpp
@@ -37,7 +37,7 @@
///////////
// Headers
#include <wx/wxprec.h>
-#ifdef __WINDOWS__
+#ifdef WITH_AVISYNTH
#include <wx/filename.h>
#include <Mmreg.h>
#include <time.h>
diff --git a/aegisub/avisynth_wrap.cpp b/aegisub/avisynth_wrap.cpp
index 0aec549db..a80650d5e 100644
--- a/aegisub/avisynth_wrap.cpp
+++ b/aegisub/avisynth_wrap.cpp
@@ -36,9 +36,9 @@
////////////
// Includes
-#include "avisynth_wrap.h"
-#ifdef __WINDOWS__
+#ifdef WITH_AVISYNTH
+#include "avisynth_wrap.h"
#include "options.h"
#ifdef DEBUG_AVISYNTH_CODE
diff --git a/aegisub/frame_main.cpp b/aegisub/frame_main.cpp
index 76f8d0dd2..d99517bea 100644
--- a/aegisub/frame_main.cpp
+++ b/aegisub/frame_main.cpp
@@ -46,7 +46,9 @@
#include "subs_grid.h"
#include "frame_main.h"
+#ifdef WITH_AVISYNTH
#include "avisynth_wrap.h"
+#endif
#include "video_display.h"
#include "video_provider.h"
#include "video_slider.h"
@@ -1104,7 +1106,7 @@ void FrameMain::LoadAudio(wxString filename,bool FromVideo) {
wxString err(error);
wxMessageBox(err, _T("Error opening audio file"), wxOK | wxICON_ERROR, this);
}
- #ifdef __WINDOWS__
+ #ifdef WITH_AVISYNTH
catch (AvisynthError err) {
wxMessageBox (wxString(_T("AviSynth error: ")) + wxString(err.msg,wxConvUTF8), _T("Error loading audio"), wxOK | wxICON_ERROR);
return;
diff --git a/aegisub/video_provider_avs.cpp b/aegisub/video_provider_avs.cpp
index 9e40077c7..b5300c2b0 100644
--- a/aegisub/video_provider_avs.cpp
+++ b/aegisub/video_provider_avs.cpp
@@ -37,7 +37,7 @@
///////////
// Headers
#include <wx/wxprec.h>
-#ifdef __WINDOWS__
+#ifdef WITH_AVISYNTH
#include <wx/filename.h>
#include <wx/msw/registry.h>
#include <wx/filename.h>
diff --git a/aegisub/win32/config0.h b/aegisub/win32/config0.h
index 0a5cd4968..0ba0fa4cc 100644
--- a/aegisub/win32/config0.h
+++ b/aegisub/win32/config0.h
@@ -60,6 +60,11 @@
//#define WITH_DIRECTSOUND
+// Enable Avisynth
+// Requires: nothing (just the avisynth dlls)
+//#define WITH_AVISYNTH
+
+
///////////// MEDIUM PRIORITY ////////////
--
GitLab