diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-11-04 15:40:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-11-04 15:40:25 +0000 |
| commit | f0d2fec29dd00bf62ba946385dea603e20a5b7f4 (patch) | |
| tree | b6673f2e7b1712f9e4e82576c93e25d6c94e6462 /gtk2_ardour/location_ui.cc | |
| parent | 3903bc0cb2764020ae7beab9f06f9b6ada6721a4 (diff) | |
Fix roll after locate from the audio clock context menu. Restore Go buttons in the location window. Fixes #3521.
git-svn-id: svn://localhost/ardour2/branches/3.0@7962 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/location_ui.cc')
| -rw-r--r-- | gtk2_ardour/location_ui.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 70a00f0a26..e1fe31a858 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -118,7 +118,7 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) set_session (sess); - // start_hbox.pack_start (start_go_button, false, false); + start_hbox.pack_start (start_go_button, false, false); start_hbox.pack_start (start_clock, false, false); /* this is always in this location, no matter what the location is */ @@ -129,7 +129,7 @@ LocationEditRow::LocationEditRow(Session * sess, Location * loc, int32_t num) 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_go_button, false, false); end_hbox.pack_start (end_clock, false, false); end_go_button.signal_clicked().connect(sigc::bind (sigc::mem_fun (*this, &LocationEditRow::go_button_pressed), LocEnd)); @@ -364,14 +364,16 @@ LocationEditRow::composer_entry_changed () void LocationEditRow::go_button_pressed (LocationPart part) { - if (!location) return; + if (!location) { + return; + } switch (part) { case LocStart: - ARDOUR_UI::instance()->do_transport_locate (location->start()); + ARDOUR_UI::instance()->do_transport_locate (location->start(), _session->transport_rolling ()); break; case LocEnd: - ARDOUR_UI::instance()->do_transport_locate (location->end()); + ARDOUR_UI::instance()->do_transport_locate (location->end(), _session->transport_rolling ()); break; default: break; |