X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=session_utils%2Fcommon.cc;h=86e945f616387e190ef3f7708690f9babb8fb212;hb=c833b560296084f5887e3c37607cd5a14580be05;hp=2abfb32d3cb3a1842df3750f67659d112d4e08e0;hpb=ea8521743717a0027f497c416ab3f08fc407a406;p=ardour.git

diff --git a/session_utils/common.cc b/session_utils/common.cc
index 2abfb32d3c..86e945f616 100644
--- a/session_utils/common.cc
+++ b/session_utils/common.cc
@@ -120,23 +120,30 @@ static Session * _load_session (string dir, string state)
 
 	float sr;
 	SampleFormat sf;
+	std::string v;
 
 	std::string s = Glib::build_filename (dir, state + statefile_suffix);
-	if (Session::get_info_from_path (s, sr, sf) == 0) {
+
+	if (!Glib::file_test (s, Glib::FILE_TEST_EXISTS | Glib::FILE_TEST_IS_REGULAR)) {
+		std::cerr << "Cannot read session '"<< s << "'\n";
+		return 0;
+	}
+
+	if (Session::get_info_from_path (s, sr, sf, v) == 0) {
 		if (engine->set_sample_rate (sr)) {
 			std::cerr << "Cannot set session's samplerate.\n";
-			::exit (EXIT_FAILURE);
+			return 0;
 		}
 	} else {
 		std::cerr << "Cannot get samplerate from session.\n";
-		::exit (EXIT_FAILURE);
+		return 0;
 	}
 
 	init_post_engine ();
 
 	if (engine->start () != 0) {
 		std::cerr << "Cannot start Audio/MIDI engine\n";
-		::exit (EXIT_FAILURE);
+		return 0;
 	}
 
 	Session* session = new Session (*engine, dir, state);
@@ -145,7 +152,7 @@ static Session * _load_session (string dir, string state)
 }
 
 Session *
-SessionUtils::load_session (string dir, string state)
+SessionUtils::load_session (string dir, string state, bool exit_at_failure)
 {
 	Session* s = 0;
 	try {
@@ -163,9 +170,52 @@ SessionUtils::load_session (string dir, string state)
 		cerr << "unknown exception.\n";
 		::exit (EXIT_FAILURE);
 	}
+	if (!s && exit_at_failure) {
+		::exit (EXIT_FAILURE);
+	}
 	return s;
 }
 
+Session *
+SessionUtils::create_session (string dir, string state, float sample_rate)
+{
+	AudioEngine* engine = AudioEngine::create ();
+
+	if (!engine->set_backend ("None (Dummy)", "Unit-Test", "")) {
+		std::cerr << "Cannot create Audio/MIDI engine\n";
+		::exit (EXIT_FAILURE);
+	}
+
+	engine->set_input_channels (256);
+	engine->set_output_channels (256);
+
+	if (engine->set_sample_rate (sample_rate)) {
+		std::cerr << "Cannot set session's samplerate.\n";
+		return 0;
+	}
+
+	init_post_engine ();
+
+	if (engine->start () != 0) {
+		std::cerr << "Cannot start Audio/MIDI engine\n";
+		return 0;
+	}
+
+	std::string s = Glib::build_filename (dir, state + statefile_suffix);
+
+	if (Glib::file_test (dir, Glib::FILE_TEST_EXISTS)) {
+		std::cerr << "Session folder already exists '"<< dir << "'\n";
+	}
+	if (Glib::file_test (s, Glib::FILE_TEST_EXISTS)) {
+		std::cerr << "Session file exists '"<< s << "'\n";
+		return 0;
+	}
+
+	Session* session = new Session (*engine, dir, state);
+	engine->set_session (session);
+	return session;
+}
+
 void
 SessionUtils::unload_session (Session *s)
 {