diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-12-01 17:51:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-12-01 17:51:17 +0000 |
| commit | bce9a0aee7dcb27f17f1b938109eda9b96228217 (patch) | |
| tree | 64ad2de2afa5247071ca8c5eaa3226a7e27e6d53 /libs/surfaces | |
| parent | f500846fd46d6eab97e5e02fd795b9a938464773 (diff) | |
Revert previous incorrect patch.
git-svn-id: svn://localhost/ardour2/branches/3.0@8144 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/control_protocol/basic_ui.cc | 8 | ||||
| -rw-r--r-- | libs/surfaces/control_protocol/control_protocol/basic_ui.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index 04e0945d13..3d00b6283f 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -285,15 +285,15 @@ BasicUI::timecode_time (nframes_t where, Timecode::Time& timecode) } void -BasicUI::timecode_to_sample (Timecode::Time& timecode, int64_t& sample, bool use_subframes) const +BasicUI::timecode_to_sample (Timecode::Time& timecode, int64_t& sample, bool use_offset, bool use_subframes) const { - session->timecode_to_sample (*((Timecode::Time*)&timecode), sample, use_subframes); + session->timecode_to_sample (*((Timecode::Time*)&timecode), sample, use_offset, use_subframes); } void -BasicUI::sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_subframes) const +BasicUI::sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const { - session->sample_to_timecode (sample, *((Timecode::Time*)&timecode), use_subframes); + session->sample_to_timecode (sample, *((Timecode::Time*)&timecode), use_offset, use_subframes); } #if 0 diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index 52ff549af3..7e25ea8a90 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -80,8 +80,8 @@ class BasicUI { jack_nframes_t timecode_frames_per_hour (); void timecode_time (jack_nframes_t where, Timecode::Time&); - void timecode_to_sample (Timecode::Time& timecode, int64_t& sample, bool use_subframes) const; - void sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_subframes) const; + void timecode_to_sample (Timecode::Time& timecode, int64_t& sample, bool use_offset, bool use_subframes) const; + void sample_to_timecode (int64_t sample, Timecode::Time& timecode, bool use_offset, bool use_subframes) const; protected: BasicUI (); |