diff options
| author | Robin Gareus <robin@gareus.org> | 2013-04-15 16:02:57 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-04-15 16:02:57 +0200 |
| commit | 90a4d0166292b8e7335db33f80334a03561ce5da (patch) | |
| tree | 9131785c3f5d4b419f127f9f6726b820d8de4fae | |
| parent | e17f75b351356279778e4ea4adbb6c0d544ba755 (diff) | |
Revert "option to ignore feedback detection - /i know what i'm doing/ mode."
This reverts commit e17f75b351356279778e4ea4adbb6c0d544ba755.
| -rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 5 |
3 files changed, 2 insertions, 12 deletions
diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index bbb0a277fa..676ebf8332 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1512,14 +1512,6 @@ RCOptionEditor::RCOptionEditor () add_option (_("Audio"), oac); - add_option (_("Audio"), - new BoolOption ( - "ignore-feedback-loops", - _("Ignore Feedback Loops"), - sigc::mem_fun (*_rc_config, &RCConfiguration::get_ignore_feedback_loops), - sigc::mem_fun (*_rc_config, &RCConfiguration::set_ignore_feedback_loops) - )); - add_option (_("Audio"), new OptionEditorHeading (_("Denormals"))); add_option (_("Audio"), diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 5b094afefc..f19f8fe808 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -192,7 +192,6 @@ CONFIG_VARIABLE (bool, sound_midi_notes, "sound-midi-notes", false) CONFIG_VARIABLE (bool, use_plugin_own_gui, "use-plugin-own-gui", true) CONFIG_VARIABLE (uint32_t, max_recent_sessions, "max-recent-sessions", 10) CONFIG_VARIABLE (double, automation_thinning_factor, "automation-thinning-factor", 20.0) -CONFIG_VARIABLE (bool, ignore_feedback_loops, "ignore-feedback-loops", false) /* denormal management */ diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 394fa73079..6fe51961d2 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1522,7 +1522,7 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r) /* Attempt a topological sort of the route graph */ boost::shared_ptr<RouteList> sorted_routes = topological_sort (r, edges); - if (Config->get_ignore_feedback_loops() || sorted_routes) { + if (sorted_routes) { /* We got a satisfactory topological sort, so there is no feedback; use this new graph. @@ -1553,9 +1553,8 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r) #endif SuccessfulGraphSort (); /* EMIT SIGNAL */ - } - if (!sorted_routes) { + } else { /* The topological sort failed, so we have a problem. Tell everyone and stick to the old graph; this will continue to be processed, so until the feedback is fixed, what is played back will not quite |