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/lib/config.cc | |
| parent | 568e553f506809e753c78a0e0cbad5906bc002b1 (diff) | |
| parent | 833d037185b37863d10adaa967c251038d9038e5 (diff) | |
Fix merge.
Diffstat (limited to 'src/lib/config.cc')
| -rw-r--r-- | src/lib/config.cc | 4 |
1 files changed, 2 insertions, 2 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)) { |