Fix build.
[ardour.git] / gtk2_ardour / session_option_editor.cc
index dbc8bbf2337cecc30e9c04ec2bf60c4f98380990..0f7483a8eb949c299c27b8e062ca42915a2a5759 100644 (file)
 */
 
 #include "ardour/session.h"
-#include "ardour/io.h"
-#include "ardour/auditioner.h"
-#include "ardour/audioengine.h"
-#include "ardour/port.h"
 
 #include "gui_thread.h"
 #include "session_option_editor.h"
@@ -36,7 +32,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
        , _session_config (&(s->config))
 {
        set_session (s);
-       
+
         set_name ("SessionProperties");
 
        /* TIMECODE*/
@@ -47,7 +43,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                sigc::mem_fun (*_session_config, &SessionConfiguration::get_sync_source),
                sigc::mem_fun (*_session_config, &SessionConfiguration::set_sync_source)
                );
-       
+
        populate_sync_options ();
        parameter_changed (string ("external-sync"));
 
@@ -55,7 +51,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Timecode"), new OptionEditorHeading (_("Timecode Settings")));
 
-
        ComboOption<TimecodeFormat>* smf = new ComboOption<TimecodeFormat> (
                "timecode-format",
                _("Timecode frames-per-second"),
@@ -116,13 +111,13 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        ClockOption* co = new ClockOption (
                "timecode-offset",
-               _("Timecode Offset"),
+               _("Timecode offset"),
                sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_offset),
                sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_offset)
                );
 
        co->set_session (_session);
-       
+
        add_option (_("Timecode"), co);
 
        add_option (_("Timecode"), new BoolOption (
@@ -132,6 +127,15 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_offset_negative)
                            ));
 
+       add_option (_("Timecode"), new OptionEditorHeading (_("JACK Transport/Time Settings")));
+
+       add_option (_("Timecode"), new BoolOption (
+                           "jack-time-master",
+                           string_compose (_("%1 is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"), PROGRAM_NAME),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_jack_time_master),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_jack_time_master)
+                           ));
+
        /* FADES */
 
        ComboOption<CrossfadeModel>* cfm = new ComboOption<CrossfadeModel> (
@@ -146,6 +150,19 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Fades"), cfm);
 
+       ComboOption<CrossfadeChoice>* cfc = new ComboOption<CrossfadeChoice> (
+               "xfade-choice",
+               _("Crossfade type"),
+               sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfade_choice),
+               sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfade_choice)
+               );
+
+       cfc->add (ConstantPowerMinus3dB, _("constant power (-3dB)"));
+       cfc->add (ConstantPowerMinus6dB, _("constant power (-6dB)"));
+       cfc->add (RegionFades, _("use existing region fade shape"));
+
+       add_option (_("Fades"), cfc);
+
        add_option (_("Fades"), new SpinOption<float> (
                _("short-xfade-seconds"),
                _("Short crossfade length"),
@@ -171,20 +188,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_xfade)
                            ));
 
-        add_option (_("Fades"), new BoolOption (
-                           "xfades-active",
-                           _("Crossfades active"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfades_active),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfades_active)
-                           ));
-
-       add_option (_("Fades"), new BoolOption (
-                           "xfades-visible",
-                           _("Crossfades visible"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_xfades_visible),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_xfades_visible)
-                           ));
-
        add_option (_("Fades"), new BoolOption (
                            "use-region-fades",
                            _("Region fades active"),
@@ -229,7 +232,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
        hf->add (CAF, _("CAF"));
 
        add_option (_("Media"), hf);
-        
+
        add_option (_("Media"), new OptionEditorHeading (_("File locations")));
 
         SearchPathOption* spo = new SearchPathOption ("audio-search-path", _("Search for audio files in:"),
@@ -243,28 +246,36 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
         add_option (_("Media"), spo);
 
-        /* Misc */
+       /* Monitoring */
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Layering (in overlaid mode)")));
+        add_option (_("Monitoring"), new BoolOption (
+                           "auto-input",
+                           _("Monitoring automatically follows transport state (\"auto-input\")"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_auto_input),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_auto_input)
+                           ));
 
-       ComboOption<LayerModel>* lm = new ComboOption<LayerModel> (
-               "layer-model",
-               _("Layering model"),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::get_layer_model),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::set_layer_model)
-               );
+        add_option (_("Monitoring"), new BoolOption (
+                           "have-monitor-section",
+                           _("Use monitor section in this session"),
+                           sigc::mem_fun (*this, &SessionOptionEditor::get_use_monitor_section),
+                           sigc::mem_fun (*this, &SessionOptionEditor::set_use_monitor_section)
+                           ));
 
-       lm->add (LaterHigher, _("later is higher"));
-       lm->add (MoveAddHigher, _("most recently moved or added is higher"));
-       lm->add (AddHigher, _("most recently added is higher"));
+        /* Misc */
 
-       add_option (_("Misc"), lm);
+       add_option (_("Misc"), new OptionEditorHeading (_("MIDI Options")));
 
-       add_option (_("Misc"), new OptionEditorHeading (_("MIDI Note Overlaps")));
+        add_option (_("Misc"), new BoolOption (
+                           "midi-copy-is-fork",
+                           _("MIDI region copies are independent"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_midi_copy_is_fork),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_midi_copy_is_fork)
+                           ));
 
        ComboOption<InsertMergePolicy>* li = new ComboOption<InsertMergePolicy> (
                "insert-merge-policy",
-               _("Policy for handling same note\nand channel overlaps"),
+               _("Policy for handling overlapping notes\n on the same MIDI channel"),
                sigc::mem_fun (*_session_config, &SessionConfiguration::get_insert_merge_policy),
                sigc::mem_fun (*_session_config, &SessionConfiguration::set_insert_merge_policy)
                );
@@ -278,20 +289,20 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Misc"), li);
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Broadcast WAVE metadata")));
+       add_option (_("Misc"), new OptionEditorHeading (_("Glue to bars and beats")));
 
-       add_option (_("Misc"), new EntryOption (
-                           "bwf-country-code",
-                           _("Country code"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_bwf_country_code),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_bwf_country_code)
+       add_option (_("Misc"), new BoolOption (
+                           "glue-new-markers-to-bars-and-beats",
+                           _("Glue new markers to bars and beats"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_glue_new_markers_to_bars_and_beats),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_glue_new_markers_to_bars_and_beats)
                            ));
 
-       add_option (_("Misc"), new EntryOption (
-                           "bwf-organization-code",
-                           _("Organization code"),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_bwf_organization_code),
-                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_bwf_organization_code)
+       add_option (_("Misc"), new BoolOption (
+                           "glue-new-regions-to-bars-and-beats",
+                           _("Glue new regions to bars and beats"),
+                           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)
                            ));
 }
 
@@ -311,8 +322,32 @@ void
 SessionOptionEditor::parameter_changed (std::string const & p)
 {
        OptionEditor::parameter_changed (p);
-       
+
        if (p == "external-sync") {
                _sync_source->set_sensitive (!_session->config.get_external_sync ());
        }
 }
+
+/* the presence of absence of a monitor section is not really a regular session
+ * property so we provide these two functions to act as setter/getter slots
+ */
+
+bool
+SessionOptionEditor::set_use_monitor_section (bool yn)
+{
+       bool had_monitor_section = _session->monitor_out();
+
+       if (yn) {
+               _session->add_monitor_section ();
+       } else {
+               _session->remove_monitor_section ();
+       }
+
+       return had_monitor_section != yn;
+}
+
+bool
+SessionOptionEditor::get_use_monitor_section ()
+{
+       return _session->monitor_out() != 0;
+}