diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-30 15:45:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-12-30 15:45:48 +0000 |
| commit | 75ede0dd6bda0136aef612b0e427ae25b208d0d0 (patch) | |
| tree | db20717fe56bd77ac352f7f218bf53b1a0f1e926 /gtk2_ardour | |
| parent | 1f87006509e024c430f24358bd85c748f10b82eb (diff) | |
change Session::convert_to_frames_at() to Session::convert_to_frames() to reflect the fact that its argument is a position, not a duration; add Session::any_duration_to_frames(), which converts AnyTime representing a duration to frames; alter callers to use the right one of the two previously mentioned methods
git-svn-id: svn://localhost/ardour2/branches/3.0@8386 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/export_format_dialog.cc | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index f0ae7c76f4..4e29cc3c8b 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1916,9 +1916,10 @@ AudioClock::bbt_frame_from_display (framepos_t pos) const if (is_duration) { any.bbt.bars++; any.bbt.beats++; - } - - return _session->convert_to_frames_at (pos, any); + return _session->any_duration_to_frames (pos, any); + } else { + return _session->convert_to_frames (any); + } } diff --git a/gtk2_ardour/export_format_dialog.cc b/gtk2_ardour/export_format_dialog.cc index ceea2b1082..89762be583 100644 --- a/gtk2_ardour/export_format_dialog.cc +++ b/gtk2_ardour/export_format_dialog.cc @@ -732,7 +732,7 @@ void ExportFormatDialog::update_clock (AudioClock & clock, ARDOUR::AnyTime const & time) { // TODO position - clock.set (_session->convert_to_frames_at (0, time), true); + clock.set (_session->convert_to_frames (time), true); AudioClock::Mode mode(AudioClock::Timecode); |