Merge branch 'master' into windows

[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 45c0c803a3a27ee81e217110dc184e9489b132c6..1815db10567e21f60c288ae81011e5fe0f59c1e1 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -79,6 +79,19 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Timecode"), _vpu);
 
+       add_option (_("Sync"), new BoolOption (
+                           "use-video-file-fps",
+                           _("Use Video File's FPS Instead of Timecode Value for Timeline and Video Monitor."),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_use_video_file_fps),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_use_video_file_fps)
+                           ));
+
+       add_option (_("Sync"), new BoolOption (
+                           "videotimeline-pullup",
+                           _("Apply Pull-Up/Down to Video Timeline and Video Monitor (Unless in JACK-sync)."),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_videotimeline_pullup),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_videotimeline_pullup)
+                           ));
 
        add_option (_("Timecode"), new OptionEditorHeading (_("Ext Timecode Offsets")));
 
@@ -258,6 +271,62 @@ 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 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
@@ -293,6 +362,10 @@ SessionOptionEditor::set_use_monitor_section (bool yn)
                _session->remove_monitor_section ();
        }
 
+       /* store this choice for any new sessions */
+       
+       Config->set_use_monitor_bus (yn);
+
        return had_monitor_section != yn;
 }