From f428e51a8c4954aacb04b9046076d45c29c3d659 Mon Sep 17 00:00:00 2001 From: Nikolaus Gullotta Date: Thu, 12 Sep 2019 13:51:11 -0500 Subject: [PATCH] Drop "_snapshot" from MixerSnapshotManager methods Since remove and rename imply that it's working on a snapshot, these are dropped for readability --- gtk2_ardour/mixer_snapshots.cc | 4 ++-- gtk2_ardour/template_dialog.cc | 4 ++-- libs/ardour/ardour/mixer_snapshot_manager.h | 4 ++-- libs/ardour/mixer_snapshot_manager.cc | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gtk2_ardour/mixer_snapshots.cc b/gtk2_ardour/mixer_snapshots.cc index 7f0eaee640..7d104722c7 100644 --- a/gtk2_ardour/mixer_snapshots.cc +++ b/gtk2_ardour/mixer_snapshots.cc @@ -507,7 +507,7 @@ void MixerSnapshotList::rename_snapshot(TreeModel::const_iterator& iter) } } - if(_session->snapshot_manager().rename_snapshot(snapshot, new_name)) { + if(_session->snapshot_manager().rename(snapshot, new_name)) { if (new_name.length() > 45) { new_name = new_name.substr(0, 45); new_name.append("..."); @@ -602,7 +602,7 @@ bool MixerSnapshotList::remove_row(Gtk::TreeModel::const_iterator& iter) MixerSnapshot* snapshot = (*iter)[_columns.snapshot]; _snapshot_model->erase((*iter)); if(snapshot) { - _session->snapshot_manager().remove_snapshot(snapshot); + _session->snapshot_manager().remove(snapshot); } return true; } diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc index 50024dc15b..9e4e5f66af 100644 --- a/gtk2_ardour/template_dialog.cc +++ b/gtk2_ardour/template_dialog.cc @@ -887,7 +887,7 @@ RouteTemplateManager::rename_template (TreeModel::iterator& item, const Glib::us SnapshotList sl = _session->snapshot_manager().get_global_snapshots(); for(SnapshotList::const_iterator it = sl.begin(); it != sl.end(); it++) { if(old_name == (*it)->get_label()) { - _session->snapshot_manager().rename_snapshot((*it), new_name); + _session->snapshot_manager().rename((*it), new_name); break; } } @@ -919,7 +919,7 @@ RouteTemplateManager::delete_selected_template () SnapshotList sl = _session->snapshot_manager().get_global_snapshots(); for(SnapshotList::const_iterator it = sl.begin(); it != sl.end(); it++) { if(file_path == (*it)->get_path()) { - _session->snapshot_manager().remove_snapshot((*it)); + _session->snapshot_manager().remove((*it)); } } } diff --git a/libs/ardour/ardour/mixer_snapshot_manager.h b/libs/ardour/ardour/mixer_snapshot_manager.h index d380c0d5ca..3e0afd1e4c 100644 --- a/libs/ardour/ardour/mixer_snapshot_manager.h +++ b/libs/ardour/ardour/mixer_snapshot_manager.h @@ -46,8 +46,8 @@ public: void find_templates(std::vector&, bool); - bool rename_snapshot(MixerSnapshot*, const std::string&); - bool remove_snapshot(MixerSnapshot*); + bool rename(MixerSnapshot*, const std::string&); + bool remove(MixerSnapshot*); bool erase(ARDOUR::MixerSnapshot*); bool move(ARDOUR::MixerSnapshot*, const std::string&); diff --git a/libs/ardour/mixer_snapshot_manager.cc b/libs/ardour/mixer_snapshot_manager.cc index 4672f6a597..7e451e2deb 100644 --- a/libs/ardour/mixer_snapshot_manager.cc +++ b/libs/ardour/mixer_snapshot_manager.cc @@ -204,7 +204,7 @@ bool MixerSnapshotManager::demote(MixerSnapshot* snapshot) { return false; } -bool MixerSnapshotManager::rename_snapshot(MixerSnapshot* snapshot, const string& new_name) { +bool MixerSnapshotManager::rename(MixerSnapshot* snapshot, const string& new_name) { if(!snapshot) { return false; } @@ -223,7 +223,7 @@ bool MixerSnapshotManager::rename_snapshot(MixerSnapshot* snapshot, const string return true; } -bool MixerSnapshotManager::remove_snapshot(MixerSnapshot* snapshot) { +bool MixerSnapshotManager::remove(MixerSnapshot* snapshot) { if(!snapshot) { return false; }