projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Accept float fps when getting timecodes from the Timecode control
[dcpomatic.git]
/
src
/
wx
/
timecode.h
diff --git
a/src/wx/timecode.h
b/src/wx/timecode.h
index 45a421c4d71774d5ad76eb161f8a842e57a6efb5..18508847b3af4e0b2f1ddf225f339c1afa7e7be5 100644
(file)
--- a/
src/wx/timecode.h
+++ b/
src/wx/timecode.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2013-201
5
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-201
6
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.
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
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/>.
*/
*/
@@
-29,11
+30,12
@@
class TimecodeBase : public wxPanel
{
public:
class TimecodeBase : public wxPanel
{
public:
- TimecodeBase (wxWindow *);
+ TimecodeBase (wxWindow *
, bool set_button
);
void clear ();
void set_editable (bool);
void clear ();
void set_editable (bool);
+ void set_focus ();
boost::signals2::signal<void ()> Changed;
boost::signals2::signal<void ()> Changed;
@@
-57,8
+59,8
@@
template <class T>
class Timecode : public TimecodeBase
{
public:
class Timecode : public TimecodeBase
{
public:
- Timecode (wxWindow* parent)
- : TimecodeBase (parent)
+ Timecode (wxWindow* parent
, bool set_button = true
)
+ : TimecodeBase (parent
, set_button
)
{
}
{
}
@@
-79,7
+81,7
@@
public:
checked_set (_fixed, t.timecode (fps));
}
checked_set (_fixed, t.timecode (fps));
}
- T get (
in
t fps) const
+ T get (
floa
t fps) const
{
T t;
std::string const h = wx_to_std (_hours->GetValue ());
{
T t;
std::string const h = wx_to_std (_hours->GetValue ());