Merge branch 'master' into cairocanvas

This commit is contained in:
Paul Davis 2014-02-11 22:50:52 -05:00
commit 8f930477be

View file

@ -504,10 +504,13 @@ ARDOUR_UI::post_engine ()
vector<string>::iterator n;
vector<string>::iterator k;
for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) {
cout << "Action: " << (*n) << " bound to " << (*k) << endl;
vector<string>::iterator p;
for (n = names.begin(), k = keys.begin(), p = paths.begin(); n != names.end(); ++n, ++k, ++p) {
cout << "Action: '" << (*n) << "' bound to '" << (*k) << "' Path: '" << (*p) << "'" << endl;
}
halt_connection.disconnect ();
AudioEngine::instance()->stop ();
exit (0);
}