diff options
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 9cbc3aad79..6934bdb2ad 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1049,10 +1049,12 @@ AudioRegionView::update_envelope_visibility () return; } - if (ARDOUR_UI::config()->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) { + if (ARDOUR_UI::config()->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseContent ) { gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::ControlPoints|AutomationLine::Line)); gain_line->canvas_group().raise_to_top (); - + } else if (trackview.editor().current_mouse_mode() == Editing::MouseRange ) { + gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::Line)); + gain_line->canvas_group().raise_to_top (); } else { gain_line->set_visibility (AutomationLine::VisibleAspects(0)); } @@ -1349,9 +1351,9 @@ AudioRegionView::exited () trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>()); trackview.editor().set_current_movable (boost::shared_ptr<Movable>()); - if (gain_line) { - gain_line->remove_visibility (AutomationLine::ControlPoints); - } +// if (gain_line) { +// gain_line->remove_visibility (AutomationLine::ControlPoints); +// } if (fade_in_handle) { fade_in_handle->hide(); } if (fade_out_handle) { fade_out_handle->hide(); } diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 4bc66610aa..3ba612efde 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -3231,7 +3231,7 @@ Editor::setup_tooltips () ARDOUR_UI::instance()->set_tip (mouse_draw_button, _("Draw Mode (draw and edit gain/notes/automation)")); ARDOUR_UI::instance()->set_tip (mouse_timefx_button, _("Stretch Mode (time-stretch audio and midi regions, preserving pitch)")); ARDOUR_UI::instance()->set_tip (mouse_audition_button, _("Audition Mode (listen to regions)")); - ARDOUR_UI::instance()->set_tip (mouse_content_button, _("Internal Edit Mode (edit notes and gain curves inside regions)")); + ARDOUR_UI::instance()->set_tip (mouse_content_button, _("Internal Edit Mode (edit notes and automation points)")); ARDOUR_UI::instance()->set_tip (*_group_tabs, _("Groups: click to (de)activate\nContext-click for other operations")); ARDOUR_UI::instance()->set_tip (nudge_forward_button, _("Nudge Region/Selection Later")); ARDOUR_UI::instance()->set_tip (nudge_backward_button, _("Nudge Region/Selection Earlier")); diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 9b38b558c9..d9a71a783e 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -2085,7 +2085,7 @@ RCOptionEditor::RCOptionEditor () "show-region-gain-envelopes", _("Show gain envelopes in audio regions"), _("in all modes"), - _("only in region gain mode"), + _("only in Draw and Internal Edit modes"), sigc::mem_fun (*_ui_config, &UIConfiguration::get_show_region_gain), sigc::mem_fun (*_ui_config, &UIConfiguration::set_show_region_gain) )); |