diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-10 14:42:11 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-04-10 14:42:11 +0000 |
| commit | a588b517e8625f758bedc66d6a7da12e8f6169c9 (patch) | |
| tree | 3809a92e96340d76cb9c8c31c99106ecd70e4312 /gtk2_ardour | |
| parent | 3b885c312674feef410243bafeef1598238ebb18 (diff) | |
fixes from carl for #1158 and #1554, plus better behaviour when building the region boundary cache
git-svn-id: svn://localhost/ardour2/trunk@1694 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui2.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/redirect_box.cc | 24 |
3 files changed, 18 insertions, 17 deletions
diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index 1e038e3ac7..0dab2657be 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -606,7 +606,7 @@ ARDOUR_UI::shuttle_box_button_release (GdkEventButton* ev) shuttle_grabbed = false; shuttle_box.remove_modal_grab (); if (Config->get_shuttle_behaviour() == Sprung) { - if (Config->get_auto_play() || roll_button.get_state()) { + if (Config->get_auto_play() || session->transport_rolling()) { shuttle_fract = SHUTTLE_FRACT_SPEED1; session->request_transport_speed (1.0); stop_button.set_visual_state (0); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index f80ec708eb..c478f47bde 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -500,15 +500,6 @@ Editor::build_region_boundary_cache () break; } - } else if (clicked_trackview) { - - TrackViewList t; - t.push_back (clicked_trackview); - - if ((r = find_next_region (pos, point, 1, t, &ontrack)) == 0) { - break; - } - } else { if ((r = find_next_region (pos, point, 1, track_views, &ontrack)) == 0) { diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index 2ab3b7af4a..d3e616eb0b 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -957,21 +957,31 @@ could not match the configuration of this track."); void RedirectBox::all_redirects_active (bool state) { - _route->all_redirects_active (state); + _route->all_redirects_active (_placement, state); } void -RedirectBox::clear_redirects() +RedirectBox::clear_redirects () { string prompt; vector<string> choices; if (boost::dynamic_pointer_cast<AudioTrack>(_route) != 0) { - prompt = _("Do you really want to remove all redirects from this track?\n" - "(this cannot be undone)"); + if (_placement == PreFader) { + prompt = _("Do you really want to remove all pre-fader redirects from this track?\n" + "(this cannot be undone)"); + } else { + prompt = _("Do you really want to remove all post-fader redirects from this track?\n" + "(this cannot be undone)"); + } } else { - prompt = _("Do you really want to remove all redirects from this bus?\n" - "(this cannot be undone)"); + if (_placement == PreFader) { + prompt = _("Do you really want to remove all pre-fader redirects from this bus?\n" + "(this cannot be undone)"); + } else { + prompt = _("Do you really want to remove all post-fader redirects from this bus?\n" + "(this cannot be undone)"); + } } choices.push_back (_("Cancel")); @@ -980,7 +990,7 @@ RedirectBox::clear_redirects() Gtkmm2ext::Choice prompter (prompt, choices); if (prompter.run () == 1) { - _route->clear_redirects (this); + _route->clear_redirects (_placement, this); } } |