From 67f557b1f4fd1f1ecd9d38f14d83a12a294cb455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Nusser?= Date: Mon, 12 Oct 2015 12:27:28 +0200 Subject: [PATCH] Add overwrite option to save_template. (default = false) Before it could not overwrite. --- libs/ardour/ardour/session.h | 2 +- libs/ardour/session_state.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 054862ce8a..0a2cb786ce 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -459,7 +459,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop int save_as (SaveAs&); int save_state (std::string snapshot_name, bool pending = false, bool switch_to_snapshot = false, bool template_only = false); int restore_state (std::string snapshot_name); - int save_template (std::string template_name); + int save_template (std::string template_name, bool replace_existing = false); int save_history (std::string snapshot_name = ""); int restore_history (std::string snapshot_name); void remove_state (std::string snapshot_name); diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index 3ccc4d606f..036e023dff 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -2102,7 +2102,7 @@ Session::XMLSourceFactory (const XMLNode& node) } int -Session::save_template (string template_name) +Session::save_template (string template_name, bool replace_existing) { if ((_state_of_the_state & CannotSave) || template_name.empty ()) { return -1; @@ -2128,10 +2128,10 @@ Session::save_template (string template_name) } if (!ARDOUR::Profile->get_trx()) { - if (Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) { + if (!replace_existing && Glib::file_test (template_dir_path, Glib::FILE_TEST_EXISTS)) { warning << string_compose(_("Template \"%1\" already exists - new version not created"), template_dir_path) << endmsg; - return -1; + return -2; } if (g_mkdir_with_parents (template_dir_path.c_str(), 0755) != 0) {