diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/config.cc | 4 | ||||
| -rw-r--r-- | src/lib/writer.cc | 5 |
2 files changed, 4 insertions, 5 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" |