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

Only wrap the avisynth-using part of AvisynthVideoProvider's constructor with try/catch so that avisynth is still initialized when the catch handler runs, which is required to actually get an error message. Closes #1444.

Browse source 
Originally committed to SVN as r6438.
This commit is contained in:
Thomas Goyne 2012-02-02 20:51:07 +00:00
parent c5c829357d
commit ddc8dc9eca
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
aegisub/src/video_provider_avs.cpp
View file

@ -53,7 +53,7 @@
#include "standard_paths.h" #include "standard_paths.h"
#include "video_provider_avs.h" #include "video_provider_avs.h"
AvisynthVideoProvider::AvisynthVideoProvider(wxString filename) try AvisynthVideoProvider::AvisynthVideoProvider(wxString filename)
: last_fnum(-1) : last_fnum(-1)
{ {
iframe.flipped = true; iframe.flipped = true;
@ -145,18 +145,20 @@ file_exit:
} }
#endif #endif
AVSValue script = Open(fname, extension); try {
AVSValue script = Open(fname, extension);
// Check if video was loaded properly // Check if video was loaded properly
if (!script.IsClip() || !script.AsClip()->GetVideoInfo().HasVideo()) if (!script.IsClip() || !script.AsClip()->GetVideoInfo().HasVideo())
throw VideoNotSupported("No usable video found"); throw VideoNotSupported("No usable video found");
RGB32Video = (avs.GetEnv()->Invoke("Cache", avs.GetEnv()->Invoke("ConvertToRGB32", script))).AsClip(); RGB32Video = (avs.GetEnv()->Invoke("Cache", avs.GetEnv()->Invoke("ConvertToRGB32", script))).AsClip();
vi = RGB32Video->GetVideoInfo(); vi = RGB32Video->GetVideoInfo();
fps = (double)vi.fps_numerator / vi.fps_denominator; fps = (double)vi.fps_numerator / vi.fps_denominator;
} }
catch (AvisynthError const& err) { catch (AvisynthError const& err) {
throw VideoOpenError("Avisynth error: " + std::string(err.msg)); throw VideoOpenError("Avisynth error: " + std::string(err.msg));
}
} }
AvisynthVideoProvider::~AvisynthVideoProvider() { AvisynthVideoProvider::~AvisynthVideoProvider() {