Revert "option to ignore feedback detection - /i know what i'm doing/ mode."

This reverts commit e17f75b351.
This commit is contained in:
Robin Gareus 2013-04-15 16:02:57 +02:00
parent e17f75b351
commit 90a4d01662
3 changed files with 2 additions and 12 deletions

View file

@ -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 */

View file

@ -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