smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 12:16:30 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/rc_option_editor.cc
View file

@ -1512,14 +1512,6 @@ RCOptionEditor::RCOptionEditor ()
add_option (_("Audio"), oac); 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"), new OptionEditorHeading (_("Denormals")));
add_option (_("Audio"), add_option (_("Audio"),

1
libs/ardour/ardour/rc_configuration_vars.h
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 (bool, use_plugin_own_gui, "use-plugin-own-gui", true)
CONFIG_VARIABLE (uint32_t, max_recent_sessions, "max-recent-sessions", 10) CONFIG_VARIABLE (uint32_t, max_recent_sessions, "max-recent-sessions", 10)
CONFIG_VARIABLE (double, automation_thinning_factor, "automation-thinning-factor", 20.0) CONFIG_VARIABLE (double, automation_thinning_factor, "automation-thinning-factor", 20.0)
CONFIG_VARIABLE (bool, ignore_feedback_loops, "ignore-feedback-loops", false)
/* denormal management */ /* denormal management */

5
libs/ardour/session.cc
View file

@ -1522,7 +1522,7 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
/* Attempt a topological sort of the route graph */ /* Attempt a topological sort of the route graph */
boost::shared_ptr<RouteList> sorted_routes = topological_sort (r, edges); 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; /* We got a satisfactory topological sort, so there is no feedback;
use this new graph. use this new graph.
@ -1553,9 +1553,8 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r)
#endif #endif
SuccessfulGraphSort (); /* EMIT SIGNAL */ SuccessfulGraphSort (); /* EMIT SIGNAL */
}
if (!sorted_routes) { } else {
/* The topological sort failed, so we have a problem. Tell everyone /* The topological sort failed, so we have a problem. Tell everyone
and stick to the old graph; this will continue to be processed, so 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 until the feedback is fixed, what is played back will not quite