Move Film::make_kdms to the call sites.

[dcpomatic.git] / src / wx / image_sequence_dialog.cc

diff --git a/src/wx/image_sequence_dialog.cc b/src/wx/image_sequence_dialog.cc
index 930ef8b6731a541cef4b2fe035a8cbfcfc1fa312..0484b900ea176e3fe55b8bf09aa9de9de409441b 100644 (file)
--- a/src/wx/image_sequence_dialog.cc
+++ b/src/wx/image_sequence_dialog.cc
@@ -1,55 +1,45 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#include <libdcp/raw_convert.h>
 #include "wx_util.h"
 #include "image_sequence_dialog.h"
+#include <dcp/locale_convert.h>
 
-using libdcp::raw_convert;
+using dcp::locale_convert;
 
 ImageSequenceDialog::ImageSequenceDialog (wxWindow* parent)
-       : TableDialog (parent, _("Add image sequence"), 2, true)
+       : TableDialog (parent, _("Add image sequence"), 2, 1, true)
 {
        add (_("Frame rate"), true);
        _frame_rate = add (new wxTextCtrl (this, wxID_ANY, N_("24")));
-       _digest = new wxCheckBox (this, wxID_ANY, _("Calculate digests"));
-       _digest->SetValue (true);
-       _digest->SetToolTip (_("By default DCP-o-matic will calculate digests (hashes) of your image files so that it knows if they change.  Turning this off will speed up import but you must not alter the image files after import or strange things may happen."));
-       add (_digest);
-
        layout ();
 }
 
-float
+double
 ImageSequenceDialog::frame_rate () const
 {
        try {
-               return raw_convert<float> (wx_to_std (_frame_rate->GetValue ()));
+               return locale_convert<double> (wx_to_std (_frame_rate->GetValue ()));
        } catch (...) {
 
        }
 
        return 0;
 }
-
-bool
-ImageSequenceDialog::digest () const
-{
-       return _digest->GetValue ();
-}