Add fade in/out option to the content audio tab (#1026).

[dcpomatic.git] / src / wx / timecode.h

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 0c99d536187cfeb61586cd9a28c1d91a62bebe08..84ef5cc1ba2bdae4da4af268d4728617d652eee6 100644 (file)
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,15 +18,19 @@
 
 */
 
+
 #ifndef DCPOMATIC_WX_TIMECODE_H
 #define DCPOMATIC_WX_TIMECODE_H
 
+
 #include "wx_util.h"
+#include "lib/dcpomatic_time.h"
 #include "lib/types.h"
 #include <dcp/raw_convert.h>
 #include <wx/wx.h>
 #include <boost/signals2.hpp>
 
+
 class TimecodeBase : public wxPanel
 {
 public:
@@ -53,8 +57,11 @@ protected:
        wxTextCtrl* _frames;
        wxButton* _set_button;
        wxStaticText* _fixed;
+
+       bool _ignore_changed = false;
 };
 
+
 template <class T>
 class Timecode : public TimecodeBase
 {
@@ -67,57 +74,45 @@ public:
 
        void set (T t, float fps)
        {
-               int h;
-               int m;
-               int s;
-               int f;
-               t.split (fps, h, m, s, f);
+               auto const hmsf = t.split (fps);
 
-               checked_set (_hours, dcp::raw_convert<std::string>(h));
-               checked_set (_minutes, dcp::raw_convert<std::string>(m));
-               checked_set (_seconds, dcp::raw_convert<std::string>(s));
-               checked_set (_frames, dcp::raw_convert<std::string>(f));
+               checked_set (_hours, dcp::raw_convert<std::string>(hmsf.h));
+               checked_set (_minutes, dcp::raw_convert<std::string>(hmsf.m));
+               checked_set (_seconds, dcp::raw_convert<std::string>(hmsf.s));
+               checked_set (_frames, dcp::raw_convert<std::string>(hmsf.f));
 
                checked_set (_fixed, t.timecode (fps));
        }
 
        void set_hint (T t, float fps)
        {
-               int h;
-               int m;
-               int s;
-               int f;
-               t.split (fps, h, m, s, f);
-
-               _hours->SetHint (std_to_wx(dcp::raw_convert<std::string>(h)));
-               _minutes->SetHint (std_to_wx(dcp::raw_convert<std::string>(m)));
-               _seconds->SetHint (std_to_wx(dcp::raw_convert<std::string>(s)));
-               _frames->SetHint (std_to_wx(dcp::raw_convert<std::string>(f)));
+               auto hmsf = t.split (fps);
+
+               _hours->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.h)));
+               _minutes->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.m)));
+               _seconds->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.s)));
+               _frames->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.f)));
        }
 
-       T get (float fps) const
+       dcpomatic::HMSF get () const
        {
-               T t;
-               std::string const h = value_or_hint (_hours);
-               t += T::from_seconds (dcp::raw_convert<int>(h.empty() ? "0" : h) * 3600);
-               std::string const m = value_or_hint (_minutes);
-               t += T::from_seconds (dcp::raw_convert<int>(m.empty() ? "0" : m) * 60);
-               std::string const s = value_or_hint (_seconds);
-               t += T::from_seconds (dcp::raw_convert<int>(s.empty() ? "0" : s));
-               std::string const f = value_or_hint (_frames);
-               t += T::from_seconds (dcp::raw_convert<double>(f.empty() ? "0" : f) / fps);
-
-               return t;
+               auto value_or_hint = [](wxTextCtrl const * t) {
+                       auto s = wx_to_std (t->GetValue().IsEmpty() ? t->GetHint() : t->GetValue());
+                       if (s.empty()) {
+                               return 0;
+                       }
+                       return dcp::raw_convert<int>(s);
+               };
+
+               return { value_or_hint(_hours),
+                       value_or_hint(_minutes),
+                       value_or_hint(_seconds),
+                       value_or_hint(_frames) };
        }
 
-private:
-       std::string value_or_hint (wxTextCtrl const * t) const
+       T get (float fps) const
        {
-               if (!t->GetValue().IsEmpty()) {
-                       return wx_to_std (t->GetValue());
-               } else {
-                       return wx_to_std (t->GetHint());
-               }
+               return T(get(), fps);
        }
 };