diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-21 19:24:37 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-21 19:24:37 +0000 |
commit | 3a4848d055927fea4e9497d05455d62d30dcb094 (patch) | |
tree | c8b97ae6348ef03ab1a58cc4d0b7f1bdf66bf061 /gtk2_ardour/audio_clock.h | |
parent | 2eeb861253f69891412d1fdfaa87b0f842a1b8f6 (diff) |
tentative code shuffle to allow for 2 different styles of clock editing
git-svn-id: svn://localhost/ardour2/branches/3.0@10742 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/audio_clock.h')
-rw-r--r-- | gtk2_ardour/audio_clock.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 07770df0f6..8af3f49abe 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -99,6 +99,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr bool _fixed_width; int layout_x_offset; int em_width; + bool _edit_by_click_field; Gtk::Menu *ops_menu; @@ -127,7 +128,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr static const double x_leading_padding; enum Field { - Timecode_Hours, + Timecode_Hours = 1, Timecode_Minutes, Timecode_Seconds, Timecode_Frames, @@ -202,7 +203,7 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr Field index_to_field () const; - void start_edit (); + void start_edit (Field f = Field (0)); void end_edit (bool); void end_edit_relative (bool); void edit_next_field (); @@ -216,6 +217,8 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr void set_font (); void set_colors (); void show_edit_status (int length); + int merge_input_and_edit_string (); + std::string get_field (Field); void drop_focus (); void dpi_reset (); |