OSC: Changed gainVCA to gainfader as VCA is already used.

[ardour.git] / gtk2_ardour / ardour_ui_options.cc

diff --git a/gtk2_ardour/ardour_ui_options.cc b/gtk2_ardour/ardour_ui_options.cc
index 028467095b2450867d494cb4d8b9b2a933cc50ad..7e098cab3859bc542ccce9d9c6b71bdac9954815 100644 (file)
--- a/gtk2_ardour/ardour_ui_options.cc
+++ b/gtk2_ardour/ardour_ui_options.cc
@@ -45,14 +45,6 @@ using namespace Gtkmm2ext;
 using namespace ARDOUR;
 using namespace PBD;
 
-void
-ARDOUR_UI::toggle_keep_tearoffs ()
-{
-       ActionManager::toggle_config_state ("Common", "KeepTearoffs", &UIConfiguration::set_keep_tearoffs, &UIConfiguration::get_keep_tearoffs);
-
-       ARDOUR_UI::update_tearoff_visibility();
-}
-
 void
 ARDOUR_UI::toggle_external_sync()
 {
@@ -91,31 +83,31 @@ ARDOUR_UI::toggle_time_master ()
 void
 ARDOUR_UI::toggle_send_mtc ()
 {
-       ActionManager::toggle_config_state ("options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc);
+       ActionManager::toggle_config_state ("Options", "SendMTC", &RCConfiguration::set_send_mtc, &RCConfiguration::get_send_mtc);
 }
 
 void
 ARDOUR_UI::toggle_send_mmc ()
 {
-       ActionManager::toggle_config_state ("options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc);
+       ActionManager::toggle_config_state ("Options", "SendMMC", &RCConfiguration::set_send_mmc, &RCConfiguration::get_send_mmc);
 }
 
 void
 ARDOUR_UI::toggle_send_midi_clock ()
 {
-       ActionManager::toggle_config_state ("options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock);
+       ActionManager::toggle_config_state ("Options", "SendMidiClock", &RCConfiguration::set_send_midi_clock, &RCConfiguration::get_send_midi_clock);
 }
 
 void
 ARDOUR_UI::toggle_use_mmc ()
 {
-       ActionManager::toggle_config_state ("options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
+       ActionManager::toggle_config_state ("Options", "UseMMC", &RCConfiguration::set_mmc_control, &RCConfiguration::get_mmc_control);
 }
 
 void
 ARDOUR_UI::toggle_send_midi_feedback ()
 {
-       ActionManager::toggle_config_state ("options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback);
+       ActionManager::toggle_config_state ("Options", "SendMIDIfeedback", &RCConfiguration::set_midi_feedback, &RCConfiguration::get_midi_feedback);
 }
 
 void
@@ -340,18 +332,16 @@ ARDOUR_UI::parameter_changed (std::string p)
 
        } else if (p == "send-mtc") {
 
-               ActionManager::map_some_state ("options", "SendMTC", &RCConfiguration::get_send_mtc);
+               ActionManager::map_some_state ("Options", "SendMTC", &RCConfiguration::get_send_mtc);
 
        } else if (p == "send-mmc") {
 
-               ActionManager::map_some_state ("options", "SendMMC", &RCConfiguration::get_send_mmc);
+               ActionManager::map_some_state ("Options", "SendMMC", &RCConfiguration::get_send_mmc);
 
-       } else if (p == "keep-tearoffs") {
-               ActionManager::map_some_state ("Common", "KeepTearoffs", &UIConfiguration::get_keep_tearoffs);
        } else if (p == "mmc-control") {
-               ActionManager::map_some_state ("options", "UseMMC", &RCConfiguration::get_mmc_control);
+               ActionManager::map_some_state ("Options", "UseMMC", &RCConfiguration::get_mmc_control);
        } else if (p == "midi-feedback") {
-               ActionManager::map_some_state ("options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback);
+               ActionManager::map_some_state ("Options", "SendMIDIfeedback", &RCConfiguration::get_midi_feedback);
        } else if (p == "auto-play") {
                ActionManager::map_some_state ("Transport", "ToggleAutoPlay", sigc::mem_fun (_session->config, &SessionConfiguration::get_auto_play));
        } else if (p == "auto-return") {
@@ -411,13 +401,13 @@ ARDOUR_UI::parameter_changed (std::string p)
 
                if (editor_meter) {
                        if (meter_box.get_parent()) {
-                               transport_tearoff_hbox.remove (meter_box);
-                               transport_tearoff_hbox.remove (editor_meter_peak_display);
+                               transport_hbox.remove (meter_box);
+                               transport_hbox.remove (editor_meter_peak_display);
                        }
 
                        if (show) {
-                               transport_tearoff_hbox.pack_start (meter_box, false, false);
-                               transport_tearoff_hbox.pack_start (editor_meter_peak_display, false, false);
+                               transport_hbox.pack_start (meter_box, false, false);
+                               transport_hbox.pack_start (editor_meter_peak_display, false, false);
                                meter_box.show();
                                editor_meter_peak_display.show();
                        }