diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
| commit | 9f63ab9931e6478472853bdda58da47ea29ac125 (patch) | |
| tree | 7edfb1d16f580e93501c24fa9f9648fe415f3745 /gtk2_ardour/engine_dialog.cc | |
| parent | 85ea9028b52eefb34184deb0fbd4d3c7632a2c38 (diff) | |
Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/engine_dialog.cc')
| -rw-r--r-- | gtk2_ardour/engine_dialog.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc index f7f8d4a67b..9835901a24 100644 --- a/gtk2_ardour/engine_dialog.cc +++ b/gtk2_ardour/engine_dialog.cc @@ -373,7 +373,7 @@ EngineControl::build_command_line (vector<string>& cmd) str = timeout_combo.get_active_text (); if (str != _("Ignore")) { - double secs; + double secs = 0; uint32_t msecs; atof (str); msecs = (uint32_t) floor (secs * 1000.0); @@ -819,7 +819,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; } @@ -1096,7 +1096,7 @@ EngineControl::set_state (const XMLNode& root) XMLNodeList clist; XMLNodeConstIterator citer; XMLNode* child; - XMLProperty* prop; + XMLProperty* prop = NULL; bool using_dummy = false; int val; @@ -1112,7 +1112,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"); |