Fix build.

[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 e5cd7780f19a378f6b097e181f4adf933cf26435..0f7483a8eb949c299c27b8e062ca42915a2a5759 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -18,10 +18,6 @@
 */
 
 #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"
@@ -115,7 +111,7 @@ 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)
                );
@@ -135,7 +131,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Timecode"), new BoolOption (
                            "jack-time-master",
-                           _("Ardour is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"),
+                           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)
                            ));
@@ -154,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"),
@@ -179,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"),
@@ -280,7 +275,7 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        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)
                );
@@ -294,22 +289,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Misc"), li);
 
-       add_option (_("Misc"), new OptionEditorHeading (_("Broadcast WAVE metadata")));
-
-       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 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 OptionEditorHeading (_("Glue to bars and beats")));
 
        add_option (_("Misc"), new BoolOption (