summaryrefslogtreecommitdiff
path: root/gtk2_ardour/engine_dialog.cc
diff options
context:
space:
mode:
authorDoug McLain <doug@nostar.net>2008-01-20 22:39:53 +0000
committerDoug McLain <doug@nostar.net>2008-01-20 22:39:53 +0000
commitaf168a0a9e5bdf590050b36e22b75a53e7c3ccbc (patch)
treeb4ec76ed8167f6e483a60de060c325b29584717b /gtk2_ardour/engine_dialog.cc
parentde80d6b95d0abaea924283457c84e67c4017321a (diff)
Fix the >=2 channel track recording waveform drawing problem, and (temporarily) bypass node checks for FFADO in the engine dialog to get rid of the FFADO related startup errors
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2953 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/engine_dialog.cc')
-rw-r--r--gtk2_ardour/engine_dialog.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 032bdb53b8..f36044cbe3 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -813,7 +813,7 @@ EngineControl::driver_changed ()
vector<string>& strings = devices[driver];
- if (strings.empty()) {
+ if (strings.empty() && driver != "FFADO") {
error << string_compose (_("No devices found for driver \"%1\""), driver) << endmsg;
return;
}
@@ -1105,7 +1105,8 @@ EngineControl::set_state (const XMLNode& root)
clist = root.children();
for (citer = clist.begin(); citer != clist.end(); ++citer) {
-
+ if ( prop && (prop->value() == "FFADO" ))
+ continue;
child = *citer;
prop = child->property ("val");