From 749291245cd0e5a928234523895bc4f794c25d5c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Tue, 19 May 2020 17:13:39 +0200 Subject: NO-OP: replace `save_state("")` with `save_state()` --- libs/ardour/ardour/session.h | 2 +- libs/ardour/session.cc | 10 +++++++--- libs/ardour/session_state.cc | 4 ++-- libs/ardour/track.cc | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 7de5fea92d..cb97fbc39d 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -563,7 +563,7 @@ public: * @param only_used_assets skip Sources that are not used, mainly useful with \p for_archive * @return zero on success */ - int save_state (std::string snapshot_name, + int save_state (std::string snapshot_name = "", bool pending = false, bool switch_to_snapshot = false, bool template_only = false, diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 5148626234..adae05b6e4 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -3119,7 +3119,7 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output set_dirty(); if (save) { - save_state (_current_snapshot_name); + save_state (); } update_route_record_state (); @@ -4375,7 +4375,11 @@ Session::remove_last_capture () destroy_sources (srcs); - save_state (_current_snapshot_name); + /* save state so we don't end up with a session file + * referring to non-existent sources. + */ + + save_state (); return 0; } @@ -4472,7 +4476,7 @@ Session::remove_source (boost::weak_ptr src) * referring to non-existent sources. */ - save_state (_current_snapshot_name); + save_state (); } } diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc index ec7fcf4d2a..62edd9efcd 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -3690,7 +3690,7 @@ Session::cleanup_sources (CleanupReport& rep) * referring to non-existent sources. */ - save_state (""); + save_state (); ret = 0; out: @@ -4764,7 +4764,7 @@ Session::bring_all_sources_into_session (boost::function