followup to the previous tempo-dragging commit: use argument to Drag::aborted() to...

[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 b382fa1025f960759d1a185c80b123b5185a0130..98ca09bb691f00a2c25da1d70a6946e302751320 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -55,7 +55,6 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
 
        add_option (_("Timecode"), new OptionEditorHeading (_("Timecode Settings")));
 
-
        ComboOption<TimecodeFormat>* smf = new ComboOption<TimecodeFormat> (
                "timecode-format",
                _("Timecode frames-per-second"),
@@ -132,6 +131,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",
+                           _("Ardour is JACK Time Master (provides Bar|Beat|Tick and other information to JACK)"),
+                           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> (
@@ -318,6 +326,13 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            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 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)
+                           ));
 }
 
 void