diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-17 22:49:13 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-17 22:49:13 +0000 |
| commit | b25fbc8a956528a7c648eb3960782aa31cc2a36e (patch) | |
| tree | b45c8e70e71dfea92cffd51ff9465d965d6fb333 /gtk2_ardour/location_ui.cc | |
| parent | f07c92530c7305fc79de28e8762efcae63040729 (diff) | |
all new implementation of audio clocks, with entirely new editing model. not entirely finished, but lookable, and usable
git-svn-id: svn://localhost/ardour2/branches/3.0@10662 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/location_ui.cc')
| -rw-r--r-- | gtk2_ardour/location_ui.cc | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 004bf9e765..020638d600 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -47,9 +47,9 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) : SessionHandlePtr (0) /* explicitly set below */ , location(0) , item_table (1, 6, false) - , start_clock (X_("locationstart"), true, X_("LocationEditRowClock"), true, false) - , end_clock (X_("locationend"), true, X_("LocationEditRowClock"), true, false) - , length_clock (X_("locationlength"), true, X_("LocationEditRowClock"), true, false, true) + , start_clock (X_("locationstart"), true, "", true, false) + , end_clock (X_("locationend"), true, "", true, false) + , length_clock (X_("locationlength"), true, "", true, false, true) , cd_check_button (_("CD")) , hide_check_button (_("Hide")) , lock_check_button (_("Lock")) @@ -136,7 +136,6 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) start_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocStart)); start_to_playhead_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocStart)); start_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocStart)); - start_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocStart)); end_hbox.pack_start (end_go_button, false, false); end_hbox.pack_start (end_clock, false, false); @@ -145,10 +144,8 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) end_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd)); end_to_playhead_button->signal_clicked().connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::to_playhead_button_pressed), LocEnd)); end_clock.ValueChanged.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::clock_changed), LocEnd)); - end_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocEnd)); length_clock.ValueChanged.connect (sigc::bind ( sigc::mem_fun(*this, &LocationEditRow::clock_changed), LocLength)); - length_clock.ChangeAborted.connect (sigc::bind (sigc::mem_fun (*this, &LocationEditRow::change_aborted), LocLength)); cd_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::cd_toggled)); hide_check_button.signal_toggled().connect(sigc::mem_fun(*this, &LocationEditRow::hide_toggled)); @@ -457,14 +454,6 @@ LocationEditRow::clock_changed (LocationPart part) } void -LocationEditRow::change_aborted (LocationPart /*part*/) -{ - if (i_am_the_modifier || !location) return; - - set_location(location); -} - -void LocationEditRow::cd_toggled () { if (i_am_the_modifier || !location) { |