save recent templates analogously to recent sessions

diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h
index fe61677c6a8ef1593ba10b75b69e4176f4508e2a..d173bde0afebb2c8a486b6fc13be7340913bd94b 100644 (file)
--- a/libs/ardour/ardour/rc_configuration_vars.h
+++ b/libs/ardour/ardour/rc_configuration_vars.h
@@ -176,6 +176,7 @@ CONFIG_VARIABLE (bool, allow_special_bus_removal, "allow-special-bus-removal", f
 CONFIG_VARIABLE (int32_t, processor_usage, "processor-usage", -1)
 CONFIG_VARIABLE (gain_t, max_gain, "max-gain", 2.0) /* +6.0dB */
 CONFIG_VARIABLE (uint32_t, max_recent_sessions, "max-recent-sessions", 10)
+CONFIG_VARIABLE (uint32_t, max_recent_templates, "max-recent-templates", 10)
 CONFIG_VARIABLE (double, automation_thinning_factor, "automation-thinning-factor", 20.0)
 CONFIG_VARIABLE (std::string, freesound_download_dir, "freesound-download-dir", Glib::get_home_dir() + "/Freesound/snd")
 CONFIG_VARIABLE (framecnt_t, range_location_minimum, "range-location-minimum", 128) /* samples */

diff --git a/libs/ardour/ardour/recent_sessions.h b/libs/ardour/ardour/recent_sessions.h
index 03134da6d2be3fd97bc1efe5f2c8f4a45fa31c3f..7c4158c9b540a65e74fd3b37377b9655537c9854 100644 (file)
--- a/libs/ardour/ardour/recent_sessions.h
+++ b/libs/ardour/ardour/recent_sessions.h
@@ -30,8 +30,11 @@ namespace ARDOUR {
        typedef std::deque<std::pair<std::string,std::string> > RecentSessions;
 
        LIBARDOUR_API int read_recent_sessions (RecentSessions& rs);
+       LIBARDOUR_API int read_recent_templates (std::deque<std::string>& rt);
        LIBARDOUR_API int store_recent_sessions (std::string name, std::string path);
+       LIBARDOUR_API int store_recent_templates (const std::string& session_template_full_name);
        LIBARDOUR_API int write_recent_sessions (RecentSessions& rs);
+       LIBARDOUR_API int write_recent_templates (std::deque<std::string>& rt);
        LIBARDOUR_API int remove_recent_sessions (const std::string& path);
 }; // namespace ARDOUR
 

diff --git a/libs/ardour/recent_sessions.cc b/libs/ardour/recent_sessions.cc
index 7c2297448b505d29f06161b13d7b1b17278402f6..7458c32ff8ac979ed7e937aacd3006c68be77e67 100644 (file)
--- a/libs/ardour/recent_sessions.cc
+++ b/libs/ardour/recent_sessions.cc
@@ -39,6 +39,7 @@ using namespace PBD;
 namespace {
 
        const char * const recent_file_name = "recent";
+       const char * const recent_templates_file_name = "recent_templates";
 
 } // anonymous
 
@@ -84,6 +85,38 @@ ARDOUR::read_recent_sessions (RecentSessions& rs)
        return 0;
 }
 
+int
+ARDOUR::read_recent_templates (std::deque<std::string>& rt)
+{
+       std::string path = Glib::build_filename (user_config_directory(), recent_templates_file_name);
+
+       ifstream recent (path.c_str());
+
+       if (!recent) {
+               if (errno != ENOENT) {
+                       error << string_compose (_("cannot open recent template file %1 (%2)"), path, strerror (errno)) << endmsg;
+                       return -1;
+               } else {
+                       return 1;
+               }
+       }
+
+       while (true) {
+
+               std::string session_template_full_name;
+
+               getline(recent, session_template_full_name);
+
+               if (!recent.good()) {
+                       break;
+               }
+
+               rt.push_back (session_template_full_name);
+       }
+
+       return 0;
+}
+
 int
 ARDOUR::write_recent_sessions (RecentSessions& rs)
 {
@@ -102,6 +135,24 @@ ARDOUR::write_recent_sessions (RecentSessions& rs)
        return 0;
 }
 
+int
+ARDOUR::write_recent_templates (std::deque<std::string>& rt)
+{
+       std::string path = Glib::build_filename (user_config_directory(), recent_templates_file_name);
+
+       std::ofstream recent (path.c_str());
+
+       if (!recent) {
+               return -1;
+       }
+
+       for (std::deque<std::string>::const_iterator i = rt.begin(); i != rt.end(); ++i) {
+               recent << (*i) << std::endl;
+       }
+
+       return 0;
+}
+
 int
 ARDOUR::store_recent_sessions (string name, string path)
 {
@@ -129,6 +180,28 @@ ARDOUR::store_recent_sessions (string name, string path)
        return ARDOUR::write_recent_sessions (rs);
 }
 
+int
+ARDOUR::store_recent_templates (const std::string& session_template_full_name)
+{
+       std::deque<std::string> rt;
+
+       if (ARDOUR::read_recent_templates (rt) < 0) {
+               return -1;
+       }
+
+       rt.erase(remove (rt.begin(), rt.end(), session_template_full_name), rt.end());
+
+       rt.push_front (session_template_full_name);
+
+       uint32_t max_recent_templates = Config->get_max_recent_templates ();
+
+       if (rt.size() > max_recent_templates) {
+               rt.erase( rt.begin() + max_recent_templates, rt.end ());
+       }
+
+       return ARDOUR::write_recent_templates (rt);
+}
+
 int
 ARDOUR::remove_recent_sessions (const string& path)
 {

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 71ad0bd7058622165619e891d282a41fc501d509..b1b0b1e1b54d62fa8d9d1c417d229c89923c1664 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -306,8 +306,11 @@ Session::Session (AudioEngine &eng,
                 * of a template.
                 */
 
-               if (!mix_template.empty() && load_state (_current_snapshot_name)) {
-                       throw failed_constructor ();
+               if (!mix_template.empty()) { 
+                       if (load_state (_current_snapshot_name)) {
+                               throw failed_constructor ();
+                       }
+                       store_recent_templates (mix_template);
                }
 
                /* load default session properties - if any */

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 4651de7286871661dcfdc307d95d00e419fa15e9..c4b3876344191296ee928b63f01788d9842c0f6b 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -100,6 +100,7 @@
 #include "ardour/playlist_source.h"
 #include "ardour/port.h"
 #include "ardour/processor.h"
+#include "ardour/profile.h"
 #include "ardour/proxy_controllable.h"
 #include "ardour/recent_sessions.h"
 #include "ardour/region_factory.h"
@@ -2072,6 +2073,8 @@ Session::save_template (string template_name)
                copy_files (plugins_dir(), template_plugin_state_path);
        }
 
+       store_recent_templates (template_file_path);
+
        return 0;
 }