Fix failure on 1-frame-back seek (#604).

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

diff --git a/src/lib/config.cc b/src/lib/config.cc
index ab57c1afcc89aea6674b929b0727d13a2b9ad7b7..e726acee189498b4b9ef75d6cda1de63c5821e70 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -91,12 +91,6 @@ Config::set_defaults ()
        _allowed_dcp_frame_rates.push_back (50);
        _allowed_dcp_frame_rates.push_back (60);
 
-       _colour_conversions.clear ();
-       _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
-       _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
-       _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
-       _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ()));
-
        set_kdm_email_to_default ();
 }
 
@@ -187,25 +181,6 @@ Config::read ()
        _default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
        _default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 
-       list<cxml::NodePtr> cc = f.node_children ("ColourConversion");
-
-       if (!cc.empty ()) {
-               _colour_conversions.clear ();
-       }
-
-       try {
-               for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) {
-                       /* This is a bit of a hack; use 32 (the first Film state file version for the 2.x branch)
-                          for version 2 and 10 (the current Film state version for the 1.x branch) for version 1.
-                       */
-                       _colour_conversions.push_back (PresetColourConversion (*i, version == 2 ? 32 : 10));
-               }
-       } catch (cxml::Error) {
-               /* Probably failed to load an old-style ColourConversion tag; just give up */
-               _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
-               _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
-       }
-
        list<cxml::NodePtr> cin = f.node_children ("Cinema");
        for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
                /* Slightly grotty two-part construction of Cinema here so that we can use
@@ -284,11 +259,18 @@ boost::filesystem::path
 Config::file () const
 {
        boost::filesystem::path p;
+#ifdef DCPOMATIC_OSX
+       p /= g_get_home_dir ();
+       p /= "Library";
+       p /= "Preferences";
+       p /= "com.dcpomatic";
+       p /= "2";
+#else
        p /= g_get_user_config_dir ();
-       boost::system::error_code ec;
-       boost::filesystem::create_directory (p, ec);
        p /= "dcpomatic2";
-       boost::filesystem::create_directory (p, ec);
+#endif
+       boost::system::error_code ec;
+       boost::filesystem::create_directories (p, ec);
        p /= "config.xml";
        return p;
 }
@@ -355,10 +337,6 @@ Config::write () const
        root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
        root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
 
-       for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
-               i->as_xml (root->add_child ("ColourConversion"));
-       }
-
        for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
                (*i)->as_xml (root->add_child ("Cinema"));
        }
@@ -431,7 +409,6 @@ Config::drop ()
 void
 Config::changed ()
 {
-       write ();
        Changed ();
 }