summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2020-05-19 17:13:39 +0200
committerRobin Gareus <robin@gareus.org>2020-05-19 17:14:47 +0200
commit749291245cd0e5a928234523895bc4f794c25d5c (patch)
tree114230d2cf9db783649f81ab00165fb931faa7e3
parent8194a83c304fa623a485c689e3c5d566bc7a4a3f (diff)
NO-OP: replace `save_state("")` with `save_state()`
-rw-r--r--libs/ardour/ardour/session.h2
-rw-r--r--libs/ardour/session.cc10
-rw-r--r--libs/ardour/session_state.cc4
-rw-r--r--libs/ardour/track.cc2
4 files changed, 11 insertions, 7 deletions
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<Source> 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<void(uint32_t,uint32_t,
}
}
- save_state ("", false, false);
+ save_state ();
return ret;
}
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc
index e8c908ecf2..981857f21e 100644
--- a/libs/ardour/track.cc
+++ b/libs/ardour/track.cc
@@ -444,7 +444,7 @@ Track::set_name (const string& str)
/* save state so that the statefile fully reflects any filename changes */
if ((ret = Route::set_name (str)) == 0) {
- _session.save_state ("");
+ _session.save_state ();
}
return ret;