smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

Drop "_snapshot" from MixerSnapshotManager methods

Browse source 
Since remove and rename imply that it's working on a snapshot, these are
dropped for readability
This commit is contained in:
Nikolaus Gullotta 2019-09-12 13:51:11 -05:00 • committed by Nikolaus Gullotta
parent 9a4281befa
commit f428e51a8c
No known key found for this signature in database
GPG key ID: 565F60578092AA31
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/mixer_snapshots.cc
View file

@ -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) { if (new_name.length() > 45) {
new_name = new_name.substr(0, 45); new_name = new_name.substr(0, 45);
new_name.append("..."); new_name.append("...");
@ -602,7 +602,7 @@ bool MixerSnapshotList::remove_row(Gtk::TreeModel::const_iterator& iter)
MixerSnapshot* snapshot = (*iter)[_columns.snapshot]; MixerSnapshot* snapshot = (*iter)[_columns.snapshot];
_snapshot_model->erase((*iter)); _snapshot_model->erase((*iter));
if(snapshot) { if(snapshot) {
_session->snapshot_manager().remove_snapshot(snapshot); _session->snapshot_manager().remove(snapshot);
} }
return true; return true;
} }

4
gtk2_ardour/template_dialog.cc
View file

@ -887,7 +887,7 @@ RouteTemplateManager::rename_template (TreeModel::iterator& item, const Glib::us
SnapshotList sl = _session->snapshot_manager().get_global_snapshots(); SnapshotList sl = _session->snapshot_manager().get_global_snapshots();
for(SnapshotList::const_iterator it = sl.begin(); it != sl.end(); it++) { for(SnapshotList::const_iterator it = sl.begin(); it != sl.end(); it++) {
if(old_name == (*it)->get_label()) { if(old_name == (*it)->get_label()) {
_session->snapshot_manager().rename_snapshot((*it), new_name); _session->snapshot_manager().rename((*it), new_name);
break; break;
} }
} }
@ -919,7 +919,7 @@ RouteTemplateManager::delete_selected_template ()
SnapshotList sl = _session->snapshot_manager().get_global_snapshots(); SnapshotList sl = _session->snapshot_manager().get_global_snapshots();
for(SnapshotList::const_iterator it = sl.begin(); it != sl.end(); it++) { for(SnapshotList::const_iterator it = sl.begin(); it != sl.end(); it++) {
if(file_path == (*it)->get_path()) { if(file_path == (*it)->get_path()) {
_session->snapshot_manager().remove_snapshot((*it)); _session->snapshot_manager().remove((*it));
} }
} }
} }

4
libs/ardour/ardour/mixer_snapshot_manager.h
View file

@ -46,8 +46,8 @@ public:
void find_templates(std::vector<ARDOUR::TemplateInfo>&, bool); void find_templates(std::vector<ARDOUR::TemplateInfo>&, bool);
bool rename_snapshot(MixerSnapshot*, const std::string&); bool rename(MixerSnapshot*, const std::string&);
bool remove_snapshot(MixerSnapshot*); bool remove(MixerSnapshot*);
bool erase(ARDOUR::MixerSnapshot*); bool erase(ARDOUR::MixerSnapshot*);
bool move(ARDOUR::MixerSnapshot*, const std::string&); bool move(ARDOUR::MixerSnapshot*, const std::string&);

4
libs/ardour/mixer_snapshot_manager.cc
View file

@ -204,7 +204,7 @@ bool MixerSnapshotManager::demote(MixerSnapshot* snapshot) {
return false; return false;
} }
bool MixerSnapshotManager::rename_snapshot(MixerSnapshot* snapshot, const string& new_name) { bool MixerSnapshotManager::rename(MixerSnapshot* snapshot, const string& new_name) {
if(!snapshot) { if(!snapshot) {
return false; return false;
} }
@ -223,7 +223,7 @@ bool MixerSnapshotManager::rename_snapshot(MixerSnapshot* snapshot, const string
return true; return true;
} }
bool MixerSnapshotManager::remove_snapshot(MixerSnapshot* snapshot) { bool MixerSnapshotManager::remove(MixerSnapshot* snapshot) {
if(!snapshot) { if(!snapshot) {
return false; return false;
} }