Option to glue new markers to bars and beats (part of

[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 2558729c54e0a151d5db00e590634c163d67dae3..bd5f359297ce26c416bad9579dd3de27699e1888 100644 (file)
--- a/gtk2_ardour/session_option_editor.cc
+++ b/gtk2_ardour/session_option_editor.cc
@@ -35,35 +35,26 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
        : OptionEditor (&(s->config), _("Session Properties"))
        , _session_config (&(s->config))
 {
-        set_name ("SessionProperties");
-
-       /* SYNC */
-
-       ComboOption<uint32_t>* spf = new ComboOption<uint32_t> (
-               "subframes-per-frame",
-               _("Subframes per frame"),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::get_subframes_per_frame),
-               sigc::mem_fun (*_session_config, &SessionConfiguration::set_subframes_per_frame)
-               );
+       set_session (s);
 
-       spf->add (80, _("80"));
-       spf->add (100, _("100"));
+        set_name ("SessionProperties");
 
-       add_option (_("Sync"), spf);
+       /* TIMECODE*/
 
-       ComboOption<SyncSource>* ssrc = new ComboOption<SyncSource> (
+       _sync_source = new ComboOption<SyncSource> (
                "sync-source",
-               _("External sync source"),
+               _("External timecode source"),
                sigc::mem_fun (*_session_config, &SessionConfiguration::get_sync_source),
                sigc::mem_fun (*_session_config, &SessionConfiguration::set_sync_source)
                );
-       
-       s->config.ParameterChanged.connect (_session_connections, invalidator (*this), ui_bind (&SessionOptionEditor::follow_sync_state, this, _1, s, ssrc), gui_context());
 
-       populate_sync_options (s, ssrc);
-       follow_sync_state (string ("external-sync"), s, ssrc);
+       populate_sync_options ();
+       parameter_changed (string ("external-sync"));
+
+       add_option (_("Timecode"), _sync_source);
+
+       add_option (_("Timecode"), new OptionEditorHeading (_("Timecode Settings")));
 
-       add_option (_("Sync"), ssrc);
 
        ComboOption<TimecodeFormat>* smf = new ComboOption<TimecodeFormat> (
                "timecode-format",
@@ -83,9 +74,21 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
        smf->add (timecode_5994, _("59.94"));
        smf->add (timecode_60, _("60"));
 
-       add_option (_("Sync"), smf);
+       add_option (_("Timecode"), smf);
 
-       add_option (_("Sync"), new BoolOption (
+       ComboOption<uint32_t>* spf = new ComboOption<uint32_t> (
+               "subframes-per-frame",
+               _("Subframes per frame"),
+               sigc::mem_fun (*_session_config, &SessionConfiguration::get_subframes_per_frame),
+               sigc::mem_fun (*_session_config, &SessionConfiguration::set_subframes_per_frame)
+               );
+
+       spf->add (80, _("80"));
+       spf->add (100, _("100"));
+
+       add_option (_("Timecode"), spf);
+
+       add_option (_("Timecode"), new BoolOption (
                            "timecode-source-is-synced",
                            _("Timecode source shares sample clock with audio interface"),
                            sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_source_is_synced),
@@ -109,7 +112,25 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
        vpu->add (-4.1667, _("-4.1667"));
        vpu->add (-4.1667 - 0.1, _("-4.1667 - 0.1%"));
 
-       add_option (_("Sync"), vpu);
+       add_option (_("Timecode"), vpu);
+
+       ClockOption* co = new ClockOption (
+               "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 (
+                           "timecode-offset-negative",
+                           _("Timecode Offset Negative"),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::get_timecode_offset_negative),
+                           sigc::mem_fun (*_session_config, &SessionConfiguration::set_timecode_offset_negative)
+                           ));
 
        /* FADES */
 
@@ -208,7 +229,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:"),
@@ -272,31 +293,35 @@ SessionOptionEditor::SessionOptionEditor (Session* s)
                            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 (
+                           "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)
+                           ));
 }
 
 void
-SessionOptionEditor::populate_sync_options (Session* s, Option* opt)
+SessionOptionEditor::populate_sync_options ()
 {
-       ComboOption<SyncSource>* sync_opt = dynamic_cast<ComboOption<SyncSource>* > (opt);
+       vector<SyncSource> sync_opts = _session->get_available_sync_options ();
 
-       vector<SyncSource> sync_opts = s->get_available_sync_options ();
-
-       sync_opt->clear ();
+       _sync_source->clear ();
 
        for (vector<SyncSource>::iterator i = sync_opts.begin(); i != sync_opts.end(); ++i) {
-               sync_opt->add (*i, sync_source_to_string (*i));
+               _sync_source->add (*i, sync_source_to_string (*i));
        }
 }
 
 void
-SessionOptionEditor::follow_sync_state (std::string p, Session* s, Option* opt)
+SessionOptionEditor::parameter_changed (std::string const & p)
 {
-       ComboOption<SyncSource>* sync_opt = dynamic_cast<ComboOption<SyncSource>* > (opt);
+       OptionEditor::parameter_changed (p);
+
        if (p == "external-sync") {
-               if (s->config.get_external_sync()) {
-                       sync_opt->set_sensitive (false);
-               } else {
-                       sync_opt->set_sensitive (true);
-               }
+               _sync_source->set_sensitive (!_session->config.get_external_sync ());
        }
 }