Originally committed to SVN as r1812.

This commit is contained in:
Rodrigo Braz Monteiro 2008-01-22 02:54:16 +00:00
parent d50c3575f9
commit 1afa7566ab
5 changed files with 12 additions and 5 deletions

View File

@ -37,7 +37,7 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include <wx/wxprec.h>
#ifdef __WINDOWS__ #ifdef WITH_AVISYNTH
#include <wx/filename.h> #include <wx/filename.h>
#include <Mmreg.h> #include <Mmreg.h>
#include <time.h> #include <time.h>

View File

@ -36,9 +36,9 @@
//////////// ////////////
// Includes // Includes
#include "avisynth_wrap.h"
#ifdef __WINDOWS__ #ifdef WITH_AVISYNTH
#include "avisynth_wrap.h"
#include "options.h" #include "options.h"
#ifdef DEBUG_AVISYNTH_CODE #ifdef DEBUG_AVISYNTH_CODE

View File

@ -46,7 +46,9 @@
#include "subs_grid.h" #include "subs_grid.h"
#include "frame_main.h" #include "frame_main.h"
#ifdef WITH_AVISYNTH
#include "avisynth_wrap.h" #include "avisynth_wrap.h"
#endif
#include "video_display.h" #include "video_display.h"
#include "video_provider.h" #include "video_provider.h"
#include "video_slider.h" #include "video_slider.h"
@ -1104,7 +1106,7 @@ void FrameMain::LoadAudio(wxString filename,bool FromVideo) {
wxString err(error); wxString err(error);
wxMessageBox(err, _T("Error opening audio file"), wxOK | wxICON_ERROR, this); wxMessageBox(err, _T("Error opening audio file"), wxOK | wxICON_ERROR, this);
} }
#ifdef __WINDOWS__ #ifdef WITH_AVISYNTH
catch (AvisynthError err) { catch (AvisynthError err) {
wxMessageBox (wxString(_T("AviSynth error: ")) + wxString(err.msg,wxConvUTF8), _T("Error loading audio"), wxOK | wxICON_ERROR); wxMessageBox (wxString(_T("AviSynth error: ")) + wxString(err.msg,wxConvUTF8), _T("Error loading audio"), wxOK | wxICON_ERROR);
return; return;

View File

@ -37,7 +37,7 @@
/////////// ///////////
// Headers // Headers
#include <wx/wxprec.h> #include <wx/wxprec.h>
#ifdef __WINDOWS__ #ifdef WITH_AVISYNTH
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/msw/registry.h> #include <wx/msw/registry.h>
#include <wx/filename.h> #include <wx/filename.h>

View File

@ -60,6 +60,11 @@
//#define WITH_DIRECTSOUND //#define WITH_DIRECTSOUND
// Enable Avisynth
// Requires: nothing (just the avisynth dlls)
//#define WITH_AVISYNTH
///////////// MEDIUM PRIORITY //////////// ///////////// MEDIUM PRIORITY ////////////