ChangeLog; fix default format on set_content.

diff --git a/ChangeLog b/ChangeLog
index 1c1881989af6fae0b00d49f707047d66e8ef968b..8b079d59b4b1e469b972f747b300c4b09410046f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-19  Carl Hetherington  <cth@carlh.net>
+
+       * Hopefully fix load of decimal values (e.g. frame rates)
+       in non-English locales on Windows.
+
 2013-05-17  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.90 released.

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 0ca3746044291ff62de38ba8d130873a86b5001c..81c7de77f72bb0b3a04f1e7d906011c8777bcca8 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -987,14 +987,7 @@ Film::set_content (string c)
        }
 
        /* Default format */
-       switch (content_type()) {
-       case STILL:
-               set_format (Format::from_id ("var-185"));
-               break;
-       case VIDEO:
-               set_format (Format::from_id ("185"));
-               break;
-       }
+       set_format (Config::instance()->default_format ());
 
        /* Still image DCPs must use external audio */
        if (content_type() == STILL) {