diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-18 05:04:18 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-18 05:04:18 +0000 |
| commit | 329a54d129ef436a7b7c0e82bf068719ce44cc45 (patch) | |
| tree | 0bfd5b53424ebe4f50fd2fb625f05ea5f932047c /gtk2_ardour/audio_clock.h | |
| parent | 30c62b5f130dff784258ba33e59eecd6da7d60c2 (diff) | |
implement relative clock editing (terminated by + or - keys, which adjust the clock by the amount of time entered)
git-svn-id: svn://localhost/ardour2/branches/3.0@10670 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.h')
| -rw-r--r-- | gtk2_ardour/audio_clock.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 061e790735..3f3c5dc846 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -152,13 +152,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr double drag_accum; Field drag_field; - /** true if the time of this clock is the one displayed in its widgets. - * if false, the time in the widgets is an approximation of _canonical_time, - * and _canonical_time should be returned as the `current' time of the clock. - */ - bool _canonical_time_is_displayed; - framepos_t _canonical_time; - void on_realize (); bool on_key_press_event (GdkEventKey *); bool on_key_release_event (GdkEventKey *); @@ -181,11 +174,11 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr bool timecode_validate_edit (const std::string&); bool bbt_validate_edit (const std::string&); - framepos_t timecode_frame_from_display () const; - framepos_t bbt_frame_from_display (framepos_t) const; - framepos_t bbt_frame_duration_from_display (framepos_t) const; - framepos_t minsec_frame_from_display () const; - framepos_t audio_frame_from_display () const; + framepos_t frames_from_timecode_string (const std::string&) const; + framepos_t frames_from_bbt_string (framepos_t, const std::string&) const; + framepos_t frame_duration_from_bbt_string (framepos_t, const std::string&) const; + framepos_t frames_from_minsec_string (const std::string&) const; + framepos_t frames_from_audioframes_string (const std::string&) const; void build_ops_menu (); @@ -208,8 +201,8 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr void set_colors (); void show_edit_status (int length); - void timecode_tester (); - + void drop_focus (); + double bg_r, bg_g, bg_b, bg_a; }; |