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

provide Treemodel::iterator to popup_context_menu to enhance performance, instead of a total refill, we just operate on the row instead

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-05-14 12:58:18 -05:00 • committed by Nikolaus Gullotta
parent 42fe3f7c6e
commit 276c07f36e
No known key found for this signature in database
GPG key ID: 565F60578092AA31
2 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

44
gtk2_ardour/mixer_snapshot_dialog.cc
View file

@ -170,8 +170,7 @@ bool MixerSnapshotDialog::button_press(GdkEventButton* ev, bool global)
}
if (iter) {
TreeModel::Row row = *(iter);
popup_context_menu(ev->button, ev->time, row[_columns.full_path], global);
popup_context_menu(ev->button, ev->time, iter, global);
return true;
}
};
@ -189,39 +188,33 @@ bool MixerSnapshotDialog::button_press(GdkEventButton* ev, bool global)
local_display.get_selection()->unselect_all();
if(iter) {
MixerSnapshot* s = (*iter)[_columns.snapshot];
s->recall();
load_snapshot(iter);
return true;
}
}
return false;
}
void MixerSnapshotDialog::popup_context_menu(int btn, int64_t time, string path, bool global)
void MixerSnapshotDialog::popup_context_menu(int btn, int64_t time, TreeModel::iterator& iter, bool global)
{
using namespace Menu_Helpers;
MenuList& items(menu.items());
items.clear();
add_item_with_sensitivity(items, MenuElem(_("Recall"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::load_snapshot), path)), true);
add_item_with_sensitivity(items, MenuElem(_("Rename..."), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::rename_snapshot), path, global)), true);
add_item_with_sensitivity(items, MenuElem(_("Remove"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::remove_snapshot), path, global)), true);
add_item_with_sensitivity(items, MenuElem(_("Recall"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::load_snapshot), iter)), true);
add_item_with_sensitivity(items, MenuElem(_("Rename..."), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::rename_snapshot), iter)), true);
add_item_with_sensitivity(items, MenuElem(_("Remove"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::remove_snapshot), iter, global)), true);
menu.popup(btn, time);
}
void MixerSnapshotDialog::remove_snapshot(const string path, bool global)
void MixerSnapshotDialog::load_snapshot(TreeModel::iterator& iter)
{
::g_remove(path.c_str());
refill_display(global);
MixerSnapshot* snap = (*iter)[_columns.snapshot];
snap->recall();
}
void MixerSnapshotDialog::load_snapshot(const string path)
{
MixerSnapshot n = MixerSnapshot(_session, path);
n.recall();
}
void MixerSnapshotDialog::rename_snapshot(const string old_path, bool global)
void MixerSnapshotDialog::rename_snapshot(TreeModel::iterator& iter)
{
string old_path = (*iter)[_columns.full_path];
string dir_name = Glib::path_get_dirname(old_path);
Prompter prompt(true);
@ -237,11 +230,24 @@ void MixerSnapshotDialog::rename_snapshot(const string old_path, bool global)
if (new_label.length() > 0) {
string new_path = Glib::build_filename(dir_name, new_label + ".xml");
::g_rename(old_path.c_str(), new_path.c_str());
refill_display(global);
(*iter)[_columns.name] = new_label;
}
}
}
void MixerSnapshotDialog::remove_snapshot(TreeModel::iterator& iter, bool global)
{
string path = (*iter)[_columns.full_path];
::g_remove(path.c_str());
if(global) {
global_model->erase(iter);
} else {
local_model->erase(iter);
}
}
bool MixerSnapshotDialog::bootstrap_display_and_model(Gtkmm2ext::DnDTreeView<string>& display, Gtk::ScrolledWindow& scroller, Glib::RefPtr<ListStore> model, bool global)
{
if(!model) {

8
gtk2_ardour/mixer_snapshot_dialog.h
View file

@ -53,15 +53,15 @@ class MixerSnapshotDialog : public ArdourWindow
void ensure_directory(bool);
void new_snapshot(bool);
void load_snapshot(const std::string);
void load_snapshot(Gtk::TreeModel::iterator&);
void new_snap_from_session(bool);
void rename_snapshot(const std::string, bool);
void remove_snapshot(const std::string, bool);
void rename_snapshot(Gtk::TreeModel::iterator&);
void remove_snapshot(Gtk::TreeModel::iterator&, bool);
bool bootstrap_display_and_model(Gtkmm2ext::DnDTreeView<std::string>&, Gtk::ScrolledWindow&, Glib::RefPtr<Gtk::ListStore>, bool);
void popup_context_menu(int, int64_t, std::string, bool);
void popup_context_menu(int, int64_t, Gtk::TreeModel::iterator&, bool);
bool button_press(GdkEventButton*, bool);
void window_opened();
void fav_cell_action(const std::string&, bool);