From bc713b00c355e3640f54135a019d8d8c5cd143ff Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 6 Aug 2017 14:47:50 +0200 Subject: [PATCH] Improve help text and error-reporting for ardour-export --- session_utils/common.cc | 6 ++++++ session_utils/export.cc | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/session_utils/common.cc b/session_utils/common.cc index 99ed10d32d..eb17cfdbeb 100644 --- a/session_utils/common.cc +++ b/session_utils/common.cc @@ -123,6 +123,12 @@ static Session * _load_session (string dir, string state) std::string v; std::string s = Glib::build_filename (dir, state + statefile_suffix); + + 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"; diff --git a/session_utils/export.cc b/session_utils/export.cc index ce523306de..aaea10a976 100644 --- a/session_utils/export.cc +++ b/session_utils/export.cc @@ -157,8 +157,11 @@ static void usage (int status) { -V, --version print version information and exit\n\ \n"); printf ("\n\ -The session is exported as 16bit wav.\n\ -If the no output file is given, the session's export dir is used.\n\ +This tool exports the session-range of a given ardour-session to a 16bit wav,\n\ +using the master-bus outputs.\n\ +If the no output-file is given, the session's export dir is used.\n\ +\n\ +Note: the tool expects a session-name without .ardour file-name extension.\n\ \n"); printf ("Report bugs to \n" @@ -228,7 +231,7 @@ int main (int argc, char* argv[]) usage (EXIT_FAILURE); } - SessionUtils::init(); + SessionUtils::init(false); Session* s = 0; s = SessionUtils::load_session (argv[optind], argv[optind+1]);