diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2019-11-01 14:04:16 -0600 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2019-11-01 14:04:28 -0600 |
| commit | a072228de5e2430bab92a3a018f5d0d5ae278d26 (patch) | |
| tree | 755bc71193a039adc8507eb87d7c0e52a414efd0 /gtk2_ardour | |
| parent | fb2f1aa8e1335c863b261114603fc6b4f0600c9c (diff) | |
remove seamless looping as an option (it's now the only kind of looping we support)
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 27 | ||||
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 13 |
2 files changed, 7 insertions, 33 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index ecc76e6dfb..03b5fa79f7 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1754,16 +1754,8 @@ ARDOUR_UI::transport_roll () */ if (!Config->get_loop_is_mode()) { - /* XXX it is not possible to just leave seamless loop and keep - playing at present (nov 4th 2009) - */ - if (!Config->get_seamless_loop()) { - /* stop loop playback and stop rolling */ - _session->request_play_loop (false, true); - } else if (rolling) { - /* stop loop playback but keep rolling */ - _session->request_play_loop (false, false); - } + /* stop loop playback but keep transport state */ + _session->request_play_loop (false, false); } } else if (_session->get_play_range () ) { @@ -1819,16 +1811,11 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode) _session->request_play_loop (false, affect_transport); } else { - if (Config->get_seamless_loop()) { - /* the disk buffers contain copies of the loop - we can't - just keep playing, so stop the transport. the user - can restart as they wish. - */ - affect_transport = true; - } else { - /* disk buffers are normal, so we can keep playing */ - affect_transport = false; - } + /* the disk buffers contain copies of the loop - we can't + just keep playing, so stop the transport. the user + can restart as they wish. + */ + affect_transport = true; _session->request_play_loop (false, affect_transport); } } else if (_session->get_play_range ()) { diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index c7e0ad1964..2a8ddf2df0 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -3178,19 +3178,6 @@ RCOptionEditor::RCOptionEditor () "<b>When disabled</b> the loop button starts playing the loop, but stop then cancels loop playback"))); add_option (_("Transport"), bo); - bo = new BoolOption ( - "seamless-loop", - _("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) - ); - Gtkmm2ext::UI::instance()->set_tip (bo->tip_widget(), - string_compose (_("<b>When enabled</b> this will loop by reading ahead and wrapping around at the loop point, " - "preventing any need to do a transport locate at the end of the loop\n\n" - "<b>When disabled</b> looping is done by locating back to the start of the loop when %1 reaches the end " - "which will often cause a small click or delay"), PROGRAM_NAME)); - add_option (_("Transport"), bo); - add_option (_("Transport"), new OptionEditorHeading (_("Dropout (xrun) Handling"))); bo = new BoolOption ( "stop-recording-on-xrun", |