diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-10-09 10:50:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-10-09 10:50:26 +0100 |
| commit | 5d398836a9b6acc2bbb536dabbd7bbc42a098659 (patch) | |
| tree | 7f613198c979212efb4e82a6f6250576a0edecef /src | |
| parent | 568e553f506809e753c78a0e0cbad5906bc002b1 (diff) | |
| parent | 833d037185b37863d10adaa967c251038d9038e5 (diff) | |
Fix merge.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/config.cc | 4 | ||||
| -rw-r--r-- | src/lib/writer.cc | 5 | ||||
| -rw-r--r-- | src/tools/dcpomatic.cc | 4 | ||||
| -rw-r--r-- | src/wx/content_menu.cc | 2 |
4 files changed, 7 insertions, 8 deletions
diff --git a/src/lib/config.cc b/src/lib/config.cc index 2429cbb3f..79a7b01f1 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)) { diff --git a/src/lib/writer.cc b/src/lib/writer.cc index caa37c211..5e8fb5b7a 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -19,13 +19,12 @@ #include <fstream> #include <cerrno> +#include <libdcp/mono_picture_asset.h> +#include <libdcp/stereo_picture_asset.h> #include <libdcp/sound_asset.h> -#include <libdcp/picture_frame.h> #include <libdcp/reel.h> #include <libdcp/dcp.h> #include <libdcp/cpl.h> -#include <libdcp/mono_picture_asset.h> -#include <libdcp/stereo_picture_asset.h> #include "writer.h" #include "compose.hpp" #include "film.h" 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); 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 }; |