Fix some capitalisation in the preferences dialog.

[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 229d3762554487dc1fc5ef4f32f4694673bd673c..9560fddc7902adf547e41dddaddce8688c455a7c 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -79,7 +79,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Timecode"), _vpu);
 
-#ifdef WITH_VIDEOTIMELINE
        add_option (_("Sync"), new BoolOption (
                            "use-video-file-fps",
                            _("Use Video File's FPS Instead of Timecode Value for Timeline and Video Monitor."),
@@ -89,11 +88,10 @@ 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)
                            ));
-#endif
 
        add_option (_("Timecode"), new OptionEditorHeading (_("Ext Timecode Offsets")));
 
@@ -273,6 +271,69 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_regions_to_bars_and_beats),
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_regions_to_bars_and_beats)
                            ));
+
+       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)
+                           ));
+
 }
 
 void
@@ -280,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);