diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-12-20 00:27:18 +0000 |
| commit | 58bf77268a8e82e73d7f17ab2fe6dcd29370ade3 (patch) | |
| tree | 0ad0542a74a029920afac6f2eb74f05770d9d4b0 /src/tools | |
| parent | 7829cea9160cd562ed3da5ca1a0060de29edacf8 (diff) | |
| parent | 7faadda40c0ab027b992789329a558fbaf3ec0cc (diff) | |
Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dvdomatic.cc | 10 | ||||
| -rw-r--r-- | src/tools/servomatictest.cc | 2 |
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_)); |