add GUI for midi-device settings (and properly indent the code)

[ardour.git] / gtk2_ardour / session_option_editor.cc

diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc
index c419a3ad2b03dfbe3d88e4dd6aa3df25b441fdb5..9560fddc7902adf547e41dddaddce8688c455a7c 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -88,7 +88,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Sync"), new BoolOption (
                            "videotimeline-pullup",
-                           _("Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless in JACK-sync)."),
+                           _("Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless using JACK-sync)."),
                            sigc::mem_fun (*_session_config, &SessionConfiguration::get_videotimeline_pullup),
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_videotimeline_pullup)
                            ));
@@ -272,12 +272,66 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
                            ));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Meterbridge Options")));
-       add_option (_("Misc"), new BoolOption (
-                           "show-busses-in-meterbridge",
-                           _("Include Busses on Meterbridge"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_busses_in_meterbridge),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_busses_in_meterbridge)
+       add_option (_("Meterbridge"), new OptionEditorHeading (_("Route Display")));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-midi-on-meterbridge",
+                           _("Show Midi Tracks"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_midi_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_midi_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-busses-on-meterbridge",
+                           _("Show Busses"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_busses_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_busses_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-master-on-meterbridge",
+                           _("Include Master Bus"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_master_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_master_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new OptionEditorHeading (_("Button Area")));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-rec-on-meterbridge",
+                           _("Rec-enable Button"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_rec_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_rec_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-mute-on-meterbridge",
+                           _("Mute Button"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_mute_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_mute_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-solo-on-meterbridge",
+                           _("Solo Button"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_solo_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_solo_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-monitor-on-meterbridge",
+                           _("Monitor Buttons"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_monitor_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_monitor_on_meterbridge)
+                           ));
+
+       add_option (_("Meterbridge"), new OptionEditorHeading (_("Name Labels")));
+
+       add_option (_("Meterbridge"), new BoolOption (
+                           "show-name-on-meterbridge",
+                           _("Track Name"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_show_name_on_meterbridge),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_show_name_on_meterbridge)
                            ));
 
 }
@@ -287,7 +341,7 @@ SessionOptionEditor::parameter_changed (std::string const & p)
 {
        OptionEditor::parameter_changed (p);
        if (p == "external-sync") {
-               if (Config->get_sync_source() == JACK) {
+               if (Config->get_sync_source() == Engine) {
                        _vpu->set_sensitive(!_session_config->get_external_sync());
                } else {
                        _vpu->set_sensitive(true);