smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-28 09:27:39 +01:00
Code Issues Projects Releases Wiki Activity

notify the user if a promoted snapshot will overwrite something in the global snapshots list

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-08-15 10:40:27 -05:00 • committed by Nikolaus Gullotta
parent 4a085b91f5
commit bb9b4119e2
No known key found for this signature in database
GPG key ID: 565F60578092AA31
3 changed files with 87 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

114
gtk2_ardour/mixer_snapshots.cc
View file

@ -469,20 +469,64 @@ void MixerSnapshotList::rename_snapshot(TreeModel::iterator& iter)
void MixerSnapshotList::promote_snapshot(TreeModel::iterator& iter)
{
MixerSnapshot* snapshot = (*iter)[_columns.snapshot];
const string name = (*iter)[_columns.name];
//let the user know that this was successful.
if(_session->snapshot_manager().promote(snapshot)) {
const string label = snapshot->get_label();
SnapshotList non_active_list;
if(_global) {
non_active_list = _session->snapshot_manager().get_local_snapshots();
} else if(!_global) {
non_active_list = _session->snapshot_manager().get_global_snapshots();
}
const string notification = string_compose(
_("Snapshot \"%1\" is now available to all sessions.\n"),
label
bool would_overwrite = false;
for(SnapshotList::const_iterator it = non_active_list.begin(); it != non_active_list.end(); it++) {
//this is going to overwite something in the *other* list
if((*it)->get_label() == snapshot->get_label()) {
would_overwrite = true;
break;
}
}
if(would_overwrite) {
const string prompt = string_compose(
_("Do you really want to overwrite snapshot \"%1\" ?\n(this cannot be undone)"),
name
);
//not leaked, self-deleting
PopUp* notify = new PopUp(WIN_POS_MOUSE, 2000, true);
notify->set_text(notification);
notify->touch();
vector<string> choices;
choices.push_back(_("No, do nothing."));
choices.push_back(_("Yes, overwrite it."));
ArdourWidgets::Choice prompter (_("Overwrite Snapshot"), prompt, choices);
if(prompter.run() == 1) {
if(_session->snapshot_manager().promote(snapshot)) {
const string notification = string_compose(
_("Snapshot \"%1\" is now available to all sessions.\n"),
name
);
//not leaked, self-deleting
PopUp* notify = new PopUp(WIN_POS_MOUSE, 2000, true);
notify->set_text(notification);
notify->touch();
}
} else {
return;
}
//not overwriting anything, we're in the clear
} else {
if(_session->snapshot_manager().promote(snapshot)) {
const string notification = string_compose(
_("Snapshot \"%1\" is now available to all sessions.\n"),
name
);
//not leaked, self-deleting
PopUp* notify = new PopUp(WIN_POS_MOUSE, 2000, true);
notify->set_text(notification);
notify->touch();
}
}
}
@ -502,7 +546,6 @@ TreeModel::const_iterator MixerSnapshotList::get_row_by_name(const std::string&
bool MixerSnapshotList::remove_row(Gtk::TreeModel::const_iterator& iter)
{
if(iter) {
const string name = (*iter)[_columns.name];
MixerSnapshot* snapshot = (*iter)[_columns.snapshot];
_snapshot_model->erase((*iter));
if(snapshot) {
@ -513,7 +556,7 @@ bool MixerSnapshotList::remove_row(Gtk::TreeModel::const_iterator& iter)
return false;
}
void MixerSnapshotList::redisplay ()
void MixerSnapshotList::redisplay()
{
if (!_session) {
return;
@ -532,25 +575,34 @@ void MixerSnapshotList::redisplay ()
_snapshot_model->clear();
for(SnapshotList::const_iterator it = active_list.begin(); it != active_list.end(); it++) {
// (*it)->LabelChanged.connect(connections, invalidator(*this), boost::bind(&MixerSnapshotList::test_func, this, _1), gui_context());
TreeModel::Row row = *(_snapshot_model->append());
row[_columns.name] = (*it)->get_label();
row[_columns.snapshot] = (*it);
//additional information for the global snapshots
if(_global) {
row[_columns.n_tracks] = (*it)->get_routes().size();
row[_columns.n_vcas] = (*it)->get_vcas().size();
row[_columns.n_groups] = (*it)->get_groups().size();
GStatBuf gsb;
g_stat((*it)->get_path().c_str(), &gsb);
Glib::DateTime gdt(Glib::DateTime::create_now_local(gsb.st_mtime));
row[_columns.timestamp] = gsb.st_mtime;;
row[_columns.date] = gdt.format("%F %H:%M");
row[_columns.version] = (*it)->get_last_modified_with();
}
new_row_from_snapshot((*it));
}
}
void MixerSnapshotList::new_row_from_snapshot(MixerSnapshot* snapshot)
{
if(!snapshot) {
return;
}
TreeModel::Row row = *(_snapshot_model->append());
row[_columns.name] = snapshot->get_label();
row[_columns.snapshot] = snapshot;
//additional information only for global snapshots
if(_global) {
row[_columns.n_tracks] = snapshot->get_routes().size();
row[_columns.n_vcas] = snapshot->get_vcas().size();
row[_columns.n_groups] = snapshot->get_groups().size();
GStatBuf gsb;
g_stat(snapshot->get_path().c_str(), &gsb);
Glib::DateTime gdt(Glib::DateTime::create_now_local(gsb.st_mtime));
row[_columns.timestamp] = gsb.st_mtime;;
row[_columns.date] = gdt.format("%F %H:%M");
row[_columns.version] = snapshot->get_last_modified_with();
}
}

1
gtk2_ardour/mixer_snapshots.h
View file

@ -55,6 +55,7 @@ public:
void new_snapshot();
void new_snapshot_from_session();
void new_row_from_snapshot(ARDOUR::MixerSnapshot*);
void redisplay ();

4
libs/ardour/mixer_snapshot_manager.cc
View file

@ -107,10 +107,12 @@ bool MixerSnapshotManager::promote(MixerSnapshot* snapshot) {
const string path = snapshot->get_path();
if(Glib::file_test(path.c_str(), Glib::FILE_TEST_EXISTS)) {
const string label = snapshot->get_label();
//write out this snapshot to the global path
snapshot->write(_global_path);
//that might've overwritten a file, erase it's reference
const string label = snapshot->get_label();
MixerSnapshot* old_snapshot = get_snapshot_by_name(label, true);
set<MixerSnapshot*>::iterator iter = _global_snapshots.find(old_snapshot);
if(iter != _global_snapshots.end()) {