smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Allow the Cut tool to appear in Mixbus.

Browse source
This commit is contained in:
Ben Loftis 2019-09-29 10:11:43 -05:00
parent 68f237169f
commit 85485d4832
3 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/editor.cc
View file

@ -3054,9 +3054,7 @@ Editor::setup_toolbar ()
Glib::RefPtr<SizeGroup> mouse_mode_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL); Glib::RefPtr<SizeGroup> mouse_mode_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL);
mouse_mode_size_group->add_widget (smart_mode_button); mouse_mode_size_group->add_widget (smart_mode_button);
mouse_mode_size_group->add_widget (mouse_move_button); mouse_mode_size_group->add_widget (mouse_move_button);
if (!Profile->get_mixbus()) { mouse_mode_size_group->add_widget (mouse_cut_button);
mouse_mode_size_group->add_widget (mouse_cut_button);
}
mouse_mode_size_group->add_widget (mouse_select_button); mouse_mode_size_group->add_widget (mouse_select_button);
mouse_mode_size_group->add_widget (mouse_timefx_button); mouse_mode_size_group->add_widget (mouse_timefx_button);
if (!Profile->get_mixbus()) { if (!Profile->get_mixbus()) {
@ -3093,8 +3091,9 @@ Editor::setup_toolbar ()
mouse_mode_hbox->pack_start (mouse_move_button, false, false); mouse_mode_hbox->pack_start (mouse_move_button, false, false);
mouse_mode_hbox->pack_start (mouse_select_button, false, false); mouse_mode_hbox->pack_start (mouse_select_button, false, false);
mouse_mode_hbox->pack_start (mouse_cut_button, false, false);
if (!ARDOUR::Profile->get_mixbus()) { if (!ARDOUR::Profile->get_mixbus()) {
mouse_mode_hbox->pack_start (mouse_cut_button, false, false);
mouse_mode_hbox->pack_start (mouse_audition_button, false, false); mouse_mode_hbox->pack_start (mouse_audition_button, false, false);
} }

10
gtk2_ardour/editor_actions.cc
View file

@ -531,12 +531,10 @@ Editor::register_actions ()
mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent); mouse_content_button.set_icon (ArdourWidgets::ArdourIcon::ToolContent);
mouse_content_button.set_name ("mouse mode button"); mouse_content_button.set_name ("mouse mode button");
if(!Profile->get_mixbus()) { act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut));
act = ActionManager::register_radio_action (mouse_mode_actions, mouse_mode_group, "set-mouse-mode-cut", _("Cut Tool"), sigc::bind (sigc::mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseCut)); mouse_cut_button.set_related_action (act);
mouse_cut_button.set_related_action (act); mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut);
mouse_cut_button.set_icon (ArdourWidgets::ArdourIcon::ToolCut); mouse_cut_button.set_name ("mouse mode button");
mouse_cut_button.set_name ("mouse mode button");
}
ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true)); ActionManager::register_action (editor_actions, "step-mouse-mode", _("Step Mouse Mode"), sigc::bind (sigc::mem_fun(*this, &Editor::step_mouse_mode), true));

2
gtk2_ardour/editor_mouse.cc
View file

@ -274,7 +274,6 @@ Editor::set_mouse_mode (MouseMode m, bool force)
} }
if (ARDOUR::Profile->get_mixbus()) { if (ARDOUR::Profile->get_mixbus()) {
if (m == MouseCut) m = MouseObject;
if (m == MouseAudition) m = MouseRange; if (m == MouseAudition) m = MouseRange;
} }
@ -292,7 +291,6 @@ void
Editor::mouse_mode_toggled (MouseMode m) Editor::mouse_mode_toggled (MouseMode m)
{ {
if (ARDOUR::Profile->get_mixbus()) { if (ARDOUR::Profile->get_mixbus()) {
if (m == MouseCut) m = MouseObject;
if (m == MouseAudition) m = MouseRange; if (m == MouseAudition) m = MouseRange;
} }