diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-05-08 12:07:33 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:10 -0400 |
commit | 445d742af187a27f035c120545b4fb3a1e4dadd3 (patch) | |
tree | 3a4b3ec19f2dd924206476839e0aa8b03cb6041f /libs | |
parent | 0365c5cc47f5f7c875714049f58f3a71cc53bdf7 (diff) |
save recent templates analogously to recent sessions
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/recent_sessions.h | 3 | ||||
-rw-r--r-- | libs/ardour/recent_sessions.cc | 73 | ||||
-rw-r--r-- | libs/ardour/session.cc | 7 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 3 |
5 files changed, 85 insertions, 2 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index fe61677c6a..d173bde0af 100644 --- 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 03134da6d2..7c4158c9b5 100644 --- 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 7c2297448b..7458c32ff8 100644 --- 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 @@ -85,6 +86,38 @@ ARDOUR::read_recent_sessions (RecentSessions& rs) } 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) { std::string path = Glib::build_filename (user_config_directory(), recent_file_name); @@ -103,6 +136,24 @@ ARDOUR::write_recent_sessions (RecentSessions& rs) } 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) { RecentSessions rs; @@ -130,6 +181,28 @@ ARDOUR::store_recent_sessions (string name, string path) } 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) { RecentSessions rs; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 71ad0bd705..b1b0b1e1b5 100644 --- 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 4651de7286..c4b3876344 100644 --- 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; } |