mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Some tweaks to help Linux compatibility

Browse source 
Originally committed to SVN as r124.
This commit is contained in:
Rodrigo Braz Monteiro 2006-02-23 04:19:57 +00:00
parent 61b8089de4
commit fdcb1857c8
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/avisynth_wrap.cpp
View file

@ -37,6 +37,8 @@
//////////// ////////////
// Includes // Includes
#include "avisynth_wrap.h" #include "avisynth_wrap.h"
#ifdef __WINDOWS__
#include "options.h" #include "options.h"
/////////////////////////////// ///////////////////////////////
@ -86,3 +88,5 @@ AviSynthWrapper::~AviSynthWrapper() {
FreeLibrary(hLib); FreeLibrary(hLib);
} }
} }
#endif

6
core/avisynth_wrap.h
View file

@ -40,10 +40,13 @@
/////////// ///////////
// Headers // Headers
#include <windows.h>
#include <wx/wxprec.h> #include <wx/wxprec.h>
#ifdef __WINDOWS__
#include <windows.h>
#include "avisynth.h" #include "avisynth.h"
////////////////////////////////// //////////////////////////////////
// Typedef to make my life easier // Typedef to make my life easier
typedef IScriptEnvironment* __stdcall FUNC(int); typedef IScriptEnvironment* __stdcall FUNC(int);
@ -65,3 +68,4 @@ public:
}; };
#endif #endif
#endif

2
core/frame_main.cpp
View file

@ -893,10 +893,12 @@ 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__
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;
} }
#endif
catch (...) { catch (...) {
wxMessageBox(_T("Unknown error"), _T("Error opening audio file"), wxOK | wxICON_ERROR, this); wxMessageBox(_T("Unknown error"), _T("Error opening audio file"), wxOK | wxICON_ERROR, this);
} }

7
core/main.cpp
View file

@ -34,13 +34,6 @@
// //
////////////////////////////
// Enable XP-style controls
//#if defined(__WXMSW__) && !defined(__WXWINCE__)
//#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='X86' publicKeyToken='6595b64144ccf1df'\"")
//#endif
//////////// ////////////
// Includes // Includes
#include <wx/wxprec.h> #include <wx/wxprec.h>

2
core/subs_grid.cpp
View file

@ -1056,7 +1056,7 @@ void SubtitlesGrid::SplitLine(int n,int pos,int mode) {
////////////////// //////////////////
// Commit changes // Commit changes
// -------------- // --------------
// This will save the work .ass and make avisynth refresh it // This will save the work .ass and refresh it
void SubtitlesGrid::CommitChanges(bool force) { void SubtitlesGrid::CommitChanges(bool force) {
if (video->loaded || force) { if (video->loaded || force) {
// Check if it's playing // Check if it's playing