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

split refill into refill_display which may speed things up slightly and add some small optimizations

Browse source
This commit is contained in:
Nikolaus Gullotta 2019-04-12 14:05:57 -05:00 • committed by Nikolaus Gullotta
parent 645e53d796
commit 42fe3f7c6e
No known key found for this signature in database
GPG key ID: 565F60578092AA31
3 changed files with 83 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

172
gtk2_ardour/mixer_snapshot_dialog.cc
View file

@ -171,7 +171,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]);
popup_context_menu(ev->button, ev->time, row[_columns.full_path], global);
return true;
}
};
@ -197,21 +197,21 @@ bool MixerSnapshotDialog::button_press(GdkEventButton* ev, bool global)
return false;
}
void MixerSnapshotDialog::popup_context_menu(int btn, int64_t time, string path)
void MixerSnapshotDialog::popup_context_menu(int btn, int64_t time, string path, 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)), true);
add_item_with_sensitivity(items, MenuElem(_("Remove"), sigc::bind(sigc::mem_fun(*this, &MixerSnapshotDialog::remove_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);
menu.popup(btn, time);
}
void MixerSnapshotDialog::remove_snapshot(const string path)
void MixerSnapshotDialog::remove_snapshot(const string path, bool global)
{
::g_remove(path.c_str());
refill();
refill_display(global);
}
void MixerSnapshotDialog::load_snapshot(const string path)
@ -220,7 +220,7 @@ void MixerSnapshotDialog::load_snapshot(const string path)
n.recall();
}
void MixerSnapshotDialog::rename_snapshot(const string old_path)
void MixerSnapshotDialog::rename_snapshot(const string old_path, bool global)
{
string dir_name = Glib::path_get_dirname(old_path);
@ -237,7 +237,7 @@ void MixerSnapshotDialog::rename_snapshot(const string old_path)
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();
refill_display(global);
}
}
}
@ -401,7 +401,7 @@ void MixerSnapshotDialog::new_snapshot(bool global)
}
snap->write(path);
refill();
refill_display(global);
}
}
}
@ -437,101 +437,73 @@ void MixerSnapshotDialog::new_snap_from_session(bool global)
}
snapshot->write(path);
refill();
refill_display(global);
}
void MixerSnapshotDialog::refill_display(bool global)
{
Glib::RefPtr<ListStore> model;
if(global) {
model = global_model;
} else {
model = local_model;
}
model->clear();
vector<string> files;
if(global) {
string dir = Glib::build_filename(user_config_directory(-1), "mixer_snapshots");
find_files_matching_pattern(files, dir, "*.xml");
} else {
string dir = Glib::build_filename(_session->session_directory().root_path(), "mixer_snapshots");
find_files_matching_pattern(files, dir, "*.xml");
}
for(vector<string>::iterator i = files.begin(); i != files.end(); i++) {
string path = *(i);
string name = basename_nosuffix(*(i));
MixerSnapshot* snap = new MixerSnapshot(_session, path);
snap->set_label(name);
TreeModel::Row row = *(model->append());
if (name.length() > 48) {
name = name.substr (0, 48);
name.append("...");
}
row[_columns.name] = name;
row[_columns.favorite] = snap->get_favorite();
row[_columns.version] = snap->get_last_modified_with();
row[_columns.n_tracks] = snap->get_routes().size();
row[_columns.n_vcas] = snap->get_vcas().size();
row[_columns.n_groups] = snap->get_groups().size();
row[_columns.has_specials] = snap->has_specials();
GStatBuf gsb;
g_stat(path.c_str(), &gsb);
Glib::DateTime gdt(Glib::DateTime::create_now_local(gsb.st_ctime));
row[_columns.timestamp] = gsb.st_ctime;
row[_columns.date] = gdt.format ("%F %H:%M");
row[_columns.full_path] = path;
row[_columns.snapshot] = snap;
#ifdef MIXBUS
row[_columns.recall_eq] = snap->get_recall_eq();
row[_columns.recall_comp] = snap->get_recall_comp();
#endif
row[_columns.recall_io] = snap->get_recall_io();
row[_columns.recall_groups] = snap->get_recall_group();
row[_columns.recall_vcas] = snap->get_recall_vca();
}
}
void MixerSnapshotDialog::refill()
{
global_model->clear();
string global_directory = Glib::build_filename(user_config_directory(-1), "mixer_snapshots");
vector<string> files;
find_files_matching_pattern(files, global_directory, "*.xml");
for(vector<string>::iterator i = files.begin(); i != files.end(); i++) {
string path = *(i);
string name = basename_nosuffix(*(i));
MixerSnapshot* snap = new MixerSnapshot(_session, path);
snap->set_label(name);
TreeModel::Row row = *(global_model->append());
if (name.length() > 48) {
name = name.substr (0, 48);
name.append("...");
}
row[_columns.name] = name;
row[_columns.favorite] = snap->get_favorite();
row[_columns.version] = snap->get_last_modified_with();
row[_columns.n_tracks] = snap->get_routes().size();
row[_columns.n_vcas] = snap->get_vcas().size();
row[_columns.n_groups] = snap->get_groups().size();
row[_columns.has_specials] = snap->has_specials();
GStatBuf gsb;
g_stat(path.c_str(), &gsb);
Glib::DateTime gdt(Glib::DateTime::create_now_local(gsb.st_ctime));
row[_columns.timestamp] = gsb.st_ctime;
row[_columns.date] = gdt.format ("%F %H:%M");
row[_columns.full_path] = path;
row[_columns.snapshot] = snap;
#ifdef MIXBUS
row[_columns.recall_eq] = snap->get_recall_eq();
row[_columns.recall_comp] = snap->get_recall_comp();
#endif
row[_columns.recall_io] = snap->get_recall_io();
row[_columns.recall_groups] = snap->get_recall_group();
row[_columns.recall_vcas] = snap->get_recall_vca();
}
local_model->clear();
files.clear();
string local_directory = Glib::build_filename(_session->session_directory().root_path(), "mixer_snapshots");
find_files_matching_pattern(files, local_directory, "*.xml");
for(vector<string>::iterator i = files.begin(); i != files.end(); i++) {
string path = *(i);
string name = basename_nosuffix(*(i));
MixerSnapshot* snap = new MixerSnapshot(_session, path);
snap->set_label(name);
TreeModel::Row row = *(local_model->append());
if (name.length() > 48) {
name = name.substr (0, 48);
name.append("...");
}
row[_columns.name] = name;
row[_columns.favorite] = snap->get_favorite();
row[_columns.version] = snap->get_last_modified_with();
row[_columns.n_tracks] = snap->get_routes().size();
row[_columns.n_vcas] = snap->get_vcas().size();
row[_columns.n_groups] = snap->get_groups().size();
row[_columns.has_specials] = snap->has_specials();
GStatBuf gsb;
g_stat(path.c_str(), &gsb);
Glib::DateTime gdt(Glib::DateTime::create_now_local(gsb.st_ctime));
row[_columns.timestamp] = gsb.st_ctime;
row[_columns.date] = gdt.format ("%F %H:%M");
row[_columns.full_path] = path;
row[_columns.snapshot] = snap;
#ifdef MIXBUS
row[_columns.recall_eq] = snap->get_recall_eq();
row[_columns.recall_comp] = snap->get_recall_comp();
#endif
row[_columns.recall_io] = snap->get_recall_io();
row[_columns.recall_groups] = snap->get_recall_group();
row[_columns.recall_vcas] = snap->get_recall_vca();
}
refill_display(true);
refill_display(false);
}
void MixerSnapshotDialog::fav_cell_action(const string& path, bool global)

7
gtk2_ardour/mixer_snapshot_dialog.h
View file

@ -48,6 +48,7 @@ class MixerSnapshotDialog : public ArdourWindow
void refill();
private:
void refill_display(bool);
void display_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& data, guint info, guint time, bool);
void ensure_directory(bool);
@ -55,12 +56,12 @@ class MixerSnapshotDialog : public ArdourWindow
void load_snapshot(const std::string);
void new_snap_from_session(bool);
void rename_snapshot(const std::string);
void remove_snapshot(const std::string);
void rename_snapshot(const std::string, bool);
void remove_snapshot(const std::string, 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);
void popup_context_menu(int, int64_t, std::string, bool);
bool button_press(GdkEventButton*, bool);
void window_opened();
void fav_cell_action(const std::string&, bool);

11
libs/ardour/mixer_snapshot.cc
View file

@ -74,15 +74,18 @@ MixerSnapshot::MixerSnapshot(Session* s, string file_path)
if(Glib::file_test(file_path.c_str(), Glib::FILE_TEST_IS_DIR)) {
load_from_session(file_path);
return;
}
string suffix = "." + PBD::get_suffix(file_path);
if(suffix == statefile_suffix) {
load_from_session(file_path);
return;
}
if(suffix == ".xml") {
load(file_path);
return;
}
}
@ -107,12 +110,12 @@ bool MixerSnapshot::set_flag(bool yn, RecallFlags flag)
}
#ifdef MIXBUS
void MixerSnapshot::set_recall_eq(bool yn) { set_flag(yn, RecallEQ);};
void MixerSnapshot::set_recall_comp(bool yn) { set_flag(yn, RecallComp);};
void MixerSnapshot::set_recall_eq(bool yn) { set_flag(yn, RecallEQ); };
void MixerSnapshot::set_recall_comp(bool yn) { set_flag(yn, RecallComp); };
#endif
void MixerSnapshot::set_recall_io(bool yn) { set_flag(yn, RecallIO);};
void MixerSnapshot::set_recall_io(bool yn) { set_flag(yn, RecallIO); };
void MixerSnapshot::set_recall_group(bool yn) { set_flag(yn, RecallGroup);};
void MixerSnapshot::set_recall_vca(bool yn) { set_flag(yn, RecallVCA);};
void MixerSnapshot::set_recall_vca(bool yn) { set_flag(yn, RecallVCA); };
bool MixerSnapshot::has_specials()
{