summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dvdomatic.cc10
-rw-r--r--src/tools/servomatictest.cc2
2 files changed, 8 insertions, 4 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index d5d5bfc2f..59f3ebc3e 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -288,9 +288,13 @@ public:
if (r == wxID_OK) {
maybe_save_then_delete_film ();
- film.reset (new Film (wx_to_std (c->GetPath ())));
- film->log()->set_level (log_level);
- set_film ();
+ try {
+ film.reset (new Film (wx_to_std (c->GetPath ())));
+ film->log()->set_level (log_level);
+ set_film ();
+ } catch (std::exception& e) {
+ error_dialog (this, String::compose ("Could not open film at %1 (%2)", wx_to_std (c->GetPath()), e.what()));
+ }
}
c->Destroy ();
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
index 41ec8075d..88c2a833e 100644
--- a/src/tools/servomatictest.cc
+++ b/src/tools/servomatictest.cc
@@ -42,7 +42,7 @@ static Server* server;
static Log log_ ("servomatictest.log");
void
-process_video (shared_ptr<Image> image, int frame)
+process_video (shared_ptr<Image> image, bool, int frame)
{
shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (image, Size (1024, 1024), 0, Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, &log_));
shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, Size (1024, 1024), 0, Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, &log_));