merge with master

[ardour.git] / libs / ardour / test / test_util.cc

diff --git a/libs/ardour/test/test_util.cc b/libs/ardour/test/test_util.cc
index f08b6759e71020630ae48eef0633423381ccc95e..dfbf40d35175b902eb9d6e8fb243a3430512c92b 100644 (file)
--- a/libs/ardour/test/test_util.cc
+++ b/libs/ardour/test/test_util.cc
@@ -60,12 +60,12 @@ check_xml (XMLNode* node, string ref_file, list<string> const & ignore_propertie
        check_nodes (p, q, ignore_properties);
 }
 
-void
+bool
 write_ref (XMLNode* node, string ref_file)
 {
        XMLTree ref;
        ref.set_root (node);
-       ref.write (ref_file);
+       return ref.write (ref_file);
 }
 
 class TestReceiver : public Receiver 
@@ -106,6 +106,9 @@ protected:
 
 TestReceiver test_receiver;
 
+/** @param dir Session directory.
+ *  @param state Session state file, without .ardour suffix.
+ */
 Session *
 load_session (string dir, string state)
 {
@@ -121,7 +124,10 @@ load_session (string dir, string state)
        */
        Config->set_use_lxvst (false);
 
-       AudioEngine* engine = new AudioEngine ("test", "");
+       AudioEngine* engine = AudioEngine::create ();
+
+       CPPUNIT_ASSERT (engine->set_default_backend ());
+
        init_post_engine ();
 
        CPPUNIT_ASSERT (engine->start () == 0);