Fix merge.

[dcpomatic.git] / src / lib / config.cc

diff --git a/src/lib/config.cc b/src/lib/config.cc
index e53e15a810c1e793984bc77787fe8b946edca721..79a7b01f1dd68f4aebf39cb07e5797533926abfa 100644 (file)
--- 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)) {
@@ -221,7 +221,8 @@ Config::file (bool old) const
        if (old) {
                p /= ".dvdomatic";
        } else {
-               p /= "dcpomatic.xml";
+               p /= "dcpomatic";
+               p /= "config.xml";
        }
        return p;
 }
@@ -231,7 +232,7 @@ Config::signer_chain_directory () const
 {
        boost::filesystem::path p;
        p /= g_get_user_config_dir ();
-       p /= "dvdomatic";
+       p /= "dcpomatic";
        p /= "crypt";
        boost::filesystem::create_directories (p);
        return p;