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

MixerSnapshotManager::rename now deletes the old snapshot properly

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-09-12 14:00:51 -05:00 • committed by Nikolaus Gullotta
parent 8032086bf2
commit bb0d10c2d4
No known key found for this signature in database
GPG key ID: 565F60578092AA31
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libs/ardour/mixer_snapshot_manager.cc
View file

@ -200,9 +200,9 @@ bool MixerSnapshotManager::demote(MixerSnapshot* snapshot) {
const string file = snapshot->get_label() + string(template_suffix); const string file = snapshot->get_label() + string(template_suffix);
const string path = Glib::build_filename(_local_path, file); const string path = Glib::build_filename(_local_path, file);
//write the snapshot to the new path, and erase the old ptr //write the snapshot to the new path, and erase the old one
if(move(snapshot, _local_path) && erase(snapshot)) { if(move(snapshot, _local_path) && erase(snapshot)) {
//push back the new ptr //insert the new snapshot
_local_snapshots.insert(new MixerSnapshot(_session, path)); _local_snapshots.insert(new MixerSnapshot(_session, path));
return true; return true;
} }
@ -218,17 +218,22 @@ bool MixerSnapshotManager::rename(MixerSnapshot* snapshot, const string& new_nam
if(new_name.empty()) { if(new_name.empty()) {
return false; return false;
} }
const string old_path = snapshot->get_path();
const string dir = Glib::path_get_dirname(old_path);
snapshot->set_label(new_name); snapshot->set_label(new_name);
const string new_path = Glib::build_filename(dir, snapshot->get_label() + string(template_suffix)); const string path = snapshot->get_path();
::g_rename(old_path.c_str(), new_path.c_str()); const string dir = Glib::path_get_dirname(path);
snapshot->set_path(new_path);
if (move(snapshot, dir)) {
RenamedSnapshot(); /* EMIT SIGNAL */ RenamedSnapshot(); /* EMIT SIGNAL */
::g_remove(path.c_str());
//remove the old file
return true; return true;
} }
return false;
}
bool MixerSnapshotManager::remove(MixerSnapshot* snapshot) { bool MixerSnapshotManager::remove(MixerSnapshot* snapshot) {
if(!snapshot) { if(!snapshot) {
return false; return false;