diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-11 16:42:38 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-11 16:42:38 +0000 |
| commit | 47a11efb125e7b7927aa1330341031a2a56e7a45 (patch) | |
| tree | 837a09cc6350a718fa20c3b17d0cbf30cdae88a9 /gtk2_ardour/session_option_editor.cc | |
| parent | 7abd6047cbe22d14f037ef729dba529e31c1e401 (diff) | |
put JACK time master option into Session -> Properties -> Timecode, and fully remove the time master button
git-svn-id: svn://localhost/ardour2/branches/3.0@10546 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/session_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/session_option_editor.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/session_option_editor.cc b/gtk2_ardour/session_option_editor.cc index b382fa1025..ce461436b8 100644 --- 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> ( |