From b531c878b0bd85f0fe98f0b37659f66c41e8eb0b Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 25 Jun 2015 12:47:22 -0400 Subject: Revert "properly track, update, maintain and set auto return state" This reverts commit 07d0539526239d895f22123d88411c0d4ee773a4. --- gtk2_ardour/ardour_ui.cc | 27 +++------------------------ gtk2_ardour/ardour_ui2.cc | 12 ------------ gtk2_ardour/ardour_ui_options.cc | 6 ------ 3 files changed, 3 insertions(+), 42 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 49424c78b6..f3483769d8 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -4875,31 +4875,10 @@ void ARDOUR_UI::toggle_auto_return_state (AutoReturnTarget t) { AutoReturnTarget art = Config->get_auto_return_target_list (); - CheckMenuItem* check_menu_item = 0; - - switch (t) { - case LastLocate: - check_menu_item = auto_return_last_locate; - break; - case Loop: - check_menu_item = auto_return_loop; - break; - case RangeSelectionStart: - check_menu_item = auto_return_range_selection; - break; - case RegionSelectionStart: - check_menu_item = auto_return_region_selection; - break; - } - - if (!check_menu_item) { - return; - } - - if (check_menu_item->get_active()) { - Config->set_auto_return_target_list (AutoReturnTarget (art | t)); - } else { + if (art & t) { Config->set_auto_return_target_list (AutoReturnTarget (art & ~t)); + } else { + Config->set_auto_return_target_list (AutoReturnTarget (art | t)); } } diff --git a/gtk2_ardour/ardour_ui2.cc b/gtk2_ardour/ardour_ui2.cc index d16b0f9c6d..db53080e5c 100644 --- a/gtk2_ardour/ardour_ui2.cc +++ b/gtk2_ardour/ardour_ui2.cc @@ -265,18 +265,6 @@ ARDOUR_UI::setup_transport () auto_return_region_selection->show (); auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::CheckMenuElem (*auto_return_region_selection)); - auto_return_range_selection = manage (new CheckMenuItem (_("Play from range selection"))); - auto_return_range_selection->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_auto_return_state), RangeSelectionStart)); - auto_return_range_selection->show (); - auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::CheckMenuElem (*auto_return_range_selection)); - - auto_return_loop = manage (new CheckMenuItem (_("Play from loop"))); - auto_return_loop->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &ARDOUR_UI::toggle_auto_return_state), Loop)); - auto_return_loop->show (); - auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::CheckMenuElem (*auto_return_loop)); - - auto_return_dropdown.AddMenuElem (Gtk::Menu_Helpers::MenuElem (_("Disable/Enable All Options"), sigc::mem_fun (*this, &ARDOUR_UI::toggle_all_auto_return))); - follow_edits_button.set_text(_("Follow Edits")); // auto_input_button.set_text (_("Auto Input")); diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc index e5feeadeb0..52f289b3f2 100644 --- a/gtk2_ardour/ardour_ui_options.cc +++ b/gtk2_ardour/ardour_ui_options.cc @@ -422,12 +422,6 @@ ARDOUR_UI::parameter_changed (std::string p) } else if (p == "waveform-cache-size") { /* GUI option has units of megabytes; image cache uses units of bytes */ ArdourCanvas::WaveView::set_image_cache_size (ARDOUR_UI::config()->get_waveform_cache_size() * 1048576); - } else if (p == "auto-return-target-list") { - AutoReturnTarget art = Config->get_auto_return_target_list (); - auto_return_loop->set_active ((bool) (art & Loop)); - auto_return_range_selection->set_active ((bool) (art & RangeSelectionStart)); - auto_return_region_selection->set_active ((bool) (art & RegionSelectionStart)); - auto_return_last_locate->set_active ((bool) (art & LastLocate)); } } -- cgit v1.2.3