diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-12-24 00:18:03 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-12-24 00:18:03 +0000 |
| commit | e194f0003b60b2607da0822485c56cd8267e78dc (patch) | |
| tree | 85aa72e1c8131372ec813c3d5a3a7f0cbb53568e /src/tools | |
| parent | 6d39d3df8e2fed1ec5e13d54ce6cd22c59b69eba (diff) | |
| parent | 3318969a7ad685fc2f624ac0af302ca1e454e62b (diff) | |
Merge 1.0.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 5 | ||||
| -rw-r--r-- | src/tools/server_test.cc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index c20283b2e..72fb56b4f 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -53,6 +53,7 @@ #include "lib/exceptions.h" #include "lib/cinema.h" #include "lib/kdm.h" +#include "lib/send_kdm_email_job.h" using std::cout; using std::string; @@ -459,7 +460,9 @@ private: if (d->write_to ()) { write_kdm_files (film, d->screens (), d->dcp (), d->from (), d->until (), d->directory ()); } else { - email_kdms (film, d->screens (), d->dcp (), d->from (), d->until ()); + JobManager::instance()->add ( + shared_ptr<Job> (new SendKDMEmailJob (film, d->screens (), d->dcp (), d->from (), d->until ())) + ); } } catch (KDMError& e) { error_dialog (this, e.what ()); diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc index cc500eeb0..38e4704b7 100644 --- a/src/tools/server_test.cc +++ b/src/tools/server_test.cc @@ -50,11 +50,11 @@ void process_video (shared_ptr<PlayerImage> image, Eyes eyes, ColourConversion conversion, DCPTime) { shared_ptr<DCPVideoFrame> local ( - new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_) + new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_) ); shared_ptr<DCPVideoFrame> remote ( - new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, log_) + new DCPVideoFrame (image->image (PIX_FMT_RGB24, false), frame, eyes, conversion, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_) ); cout << "Frame " << frame << ": "; |