From dd4b5586c443a8445a9bef7f2a449f4f1f50860e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 1 Oct 2013 16:03:32 +0100 Subject: Adapt for new libdcp API; clarify name of libquickmail in configuration. --- src/lib/writer.cc | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 37376ca23..85c913d00 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -19,7 +19,8 @@ #include #include -#include +#include +#include #include #include #include @@ -77,9 +78,7 @@ Writer::Writer (shared_ptr f, shared_ptr j) _picture_asset.reset ( new libdcp::StereoPictureAsset ( _film->internal_video_mxf_dir (), - _film->internal_video_mxf_filename (), - _film->video_frame_rate (), - _film->container()->size (_film->full_frame ()) + _film->internal_video_mxf_filename () ) ); @@ -87,35 +86,37 @@ Writer::Writer (shared_ptr f, shared_ptr j) _picture_asset.reset ( new libdcp::MonoPictureAsset ( _film->internal_video_mxf_dir (), - _film->internal_video_mxf_filename (), - _film->video_frame_rate (), - _film->container()->size (_film->full_frame ()) + _film->internal_video_mxf_filename () ) ); } + _picture_asset->set_edit_rate (_film->video_frame_rate ()); + _picture_asset->set_size (_film->container()->size (_film->full_frame ())); + if (_film->encrypted ()) { _picture_asset->set_key (_film->key ()); } - _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0, _film->interop ()); + _picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0); _sound_asset.reset ( new libdcp::SoundAsset ( _film->dir (_film->dcp_name()), - _film->audio_mxf_filename (), - _film->video_frame_rate (), - _film->audio_channels (), - _film->audio_frame_rate () + _film->audio_mxf_filename () ) ); + _sound_asset->set_edit_rate (_film->video_frame_rate ()); + _sound_asset->set_channels (_film->audio_channels ()); + _sound_asset->set_sampling_rate (_film->audio_frame_rate ()); + if (_film->encrypted ()) { _sound_asset->set_key (_film->key ()); } - _sound_asset_writer = _sound_asset->start_write (_film->interop ()); + _sound_asset_writer = _sound_asset->start_write (); _thread = new boost::thread (boost::bind (&Writer::thread, this)); -- cgit v1.2.3 From 7b2c714a46e0120b40a9516957743571613c7c70 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 2 Oct 2013 09:50:09 +0100 Subject: Remove unnecessary include. --- src/lib/writer.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 85c913d00..dc60e7947 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include -- cgit v1.2.3 From b715ab435c30bd3dd2f4f83913d407ab61176393 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 4 Oct 2013 14:15:43 +0100 Subject: Windows build fix. --- src/lib/config.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/config.cc b/src/lib/config.cc index e53e15a81..ba899fe57 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -52,7 +52,7 @@ Config* Config::_instance = 0; Config::Config () : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) , _server_port (6192) - , _tms_path (N_(".")) + , _tms_path (".") , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750"))) , _default_still_length (10) , _default_container (Ratio::from_id ("185")) @@ -151,7 +151,7 @@ Config::read () void Config::read_old_metadata () { - ifstream f (file(true).c_str ()); + ifstream f (file(true).string().c_str ()); string line; while (getline (f, line)) { -- cgit v1.2.3 From 27101c560e670bee6f6190a59b5452b1c128b2a5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 4 Oct 2013 14:30:25 +0100 Subject: Windows build fixes. --- src/tools/dcpomatic.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 86886ed9e..7646d5ebe 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -502,7 +502,7 @@ private: boost::filesystem::path zip_file = boost::filesystem::temp_directory_path (); zip_file /= boost::filesystem::unique_path().string() + ".zip"; - struct zip* zip = zip_open (zip_file.c_str(), ZIP_CREATE | ZIP_EXCL, 0); + struct zip* zip = zip_open (zip_file.string().c_str(), ZIP_CREATE | ZIP_EXCL, 0); if (!zip) { throw FileError ("could not create ZIP file", zip_file); } @@ -540,7 +540,7 @@ private: boost::algorithm::replace_all (body, "$DCP_NAME", film->dcp_name ()); quickmail_set_body (mail, body.c_str()); - quickmail_add_attachment_file (mail, zip_file.c_str()); + quickmail_add_attachment_file (mail, zip_file.string().c_str()); char const* error = quickmail_send (mail, Config::instance()->mail_server().c_str(), 25, "", ""); if (error) { quickmail_destroy (mail); -- cgit v1.2.3 From 833d037185b37863d10adaa967c251038d9038e5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 7 Oct 2013 11:25:33 +0100 Subject: Hopefully fix menu id error on OS X. --- src/wx/content_menu.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc index 1a409fa6c..60a95a9f2 100644 --- a/src/wx/content_menu.cc +++ b/src/wx/content_menu.cc @@ -27,7 +27,7 @@ using std::cout; using boost::shared_ptr; enum { - ID_repeat, + ID_repeat = 1, ID_remove }; -- cgit v1.2.3