1 files changed, 7 insertions, 55 deletions

diff --git a/libs/ardour/test/profiling/runpc.cc b/libs/ardour/test/profiling/runpc.cc
index 90f9136e23..ef5d322df2 100644
--- a/libs/ardour/test/profiling/runpc.cc
+++ b/libs/ardour/test/profiling/runpc.cc
@@ -5,49 +5,12 @@
 #include "pbd/enumwriter.h"
 #include "ardour/session.h"
 #include "ardour/audioengine.h"
+#include "test_util.h"
 
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-class TestReceiver : public Receiver 
-{
-protected:
-	void receive (Transmitter::Channel chn, const char * str) {
-		const char *prefix = "";
-		
-		switch (chn) {
-		case Transmitter::Error:
-			prefix = ": [ERROR]: ";
-			break;
-		case Transmitter::Info:
-			/* ignore */
-			return;
-		case Transmitter::Warning:
-			prefix = ": [WARNING]: ";
-			break;
-		case Transmitter::Fatal:
-			prefix = ": [FATAL]: ";
-			break;
-		case Transmitter::Throw:
-			/* this isn't supposed to happen */
-			abort ();
-		}
-		
-		/* note: iostreams are already thread-safe: no external
-		   lock required.
-		*/
-		
-		cout << prefix << str << endl;
-		
-		if (chn == Transmitter::Fatal) {
-			exit (9);
-		}
-	}
-};
-
-TestReceiver test_receiver;
-
 int
 main (int argc, char* argv[])
 {
@@ -55,29 +18,18 @@ main (int argc, char* argv[])
 		cerr << argv[0] << ": <session>\n";
 		exit (EXIT_FAILURE);
 	}
-	
-	string const test_session_path = string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]);
-	string const test_session_snapshot = string_compose ("%1.ardour", argv[1]);
-	
-	init (false, true);
-	SessionEvent::create_per_thread_pool ("test", 512);
-
-	test_receiver.listen_to (error);
-	test_receiver.listen_to (info);
-	test_receiver.listen_to (fatal);
-	test_receiver.listen_to (warning);
 
-	AudioEngine* engine = new AudioEngine ("test", "");
-	engine->start ();
-	MIDI::Manager::create (engine->jack ());
+	ARDOUR::init (false, true);
 
-	Session* session = new Session (*engine, test_session_path, test_session_snapshot);
-	engine->set_session (session);
+	Session* session = load_session (
+		string_compose ("../libs/ardour/test/profiling/sessions/%1", argv[1]),
+		string_compose ("%1.ardour", argv[1])
+		);
 
 	cout << "INFO: " << session->get_routes()->size() << " routes.\n";
 
 	for (int i = 0; i < 32768; ++i) {
-		session->process (64);
+		session->process (session->engine().frames_per_cycle ());
 	}
 
 	return 0;