diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-10-16 22:06:56 -0400 |
| commit | e5888d398350b26ba2cdc634cc9791e90b4fc6b6 (patch) | |
| tree | 54f485ea56d034ecba01938fbc680b12884fc136 /gtk2_ardour/rc_option_editor.cc | |
| parent | 18850253e9f0034fad132e0da07a2651ce041450 (diff) | |
| parent | da5a49067839ec32a016bf1b66c3808ad7cbf699 (diff) | |
merge with master and fix 2 conflicts
Diffstat (limited to 'gtk2_ardour/rc_option_editor.cc')
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index 04b3b5a8c2..7b8eb2ea20 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1146,7 +1146,7 @@ RCOptionEditor::RCOptionEditor () tsf = new BoolOption ( "seamless-loop", - _("Do seamless looping (not possible when slaved to MTC, JACK etc)"), + _("Do seamless looping (not possible when slaved to MTC, LTC etc)"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop), sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop) ); @@ -1456,12 +1456,10 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model) ); -#ifndef __APPLE__ - /* no JACK monitoring on CoreAudio */ if (AudioEngine::instance()->port_engine().can_monitor_input()) { mm->add (HardwareMonitoring, _("via Audio Driver")); } -#endif + mm->add (SoftwareMonitoring, _("ardour")); mm->add (ExternalMonitoring, _("audio hardware")); |