ardour/livetrax
13
0
Fork 0
Code

Optimize RegionList redisplay for batch changes

Browse Source
This commit is contained in:
Robin Gareus 2021-05-07 23:15:47 +02:00
parent f6c011cb65
commit b0d4f77d92
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/editor_regions.cc
View File

@ -439,6 +439,10 @@ EditorRegions::remove_unused_regions ()
void
EditorRegions::regions_changed (boost::shared_ptr<RegionList> rl, const PropertyChange& what_changed)
{
bool freeze = rl->size () > 2;
if (freeze) {
freeze_tree_model ();
}
for (RegionList::const_iterator i = rl->begin (); i != rl->end(); ++i) {
boost::shared_ptr<Region> r = *i;
@ -474,6 +478,9 @@ EditorRegions::regions_changed (boost::shared_ptr<RegionList> rl, const Property
populate_row (r, row, PropertyChange ());
}
}
if (freeze) {
thaw_tree_model ();
}
}
void
@ -534,9 +541,7 @@ EditorRegions::redisplay ()
}
/* store sort column id and type for later */
int sort_col_id;
Gtk::SortType sort_type;
_model->get_sort_column_id (sort_col_id, sort_type);
_model->get_sort_column_id (_sort_col_id, _sort_type);
_display.set_model (Glib::RefPtr<Gtk::TreeStore> (0));
_model->clear ();
@ -547,7 +552,7 @@ EditorRegions::redisplay ()
RegionFactory::foreach_region (sigc::mem_fun (*this, &EditorRegions::add_region));
_model->set_sort_column (sort_col_id, sort_type); // re-enabale sorting
_model->set_sort_column (_sort_col_id, _sort_type); // re-enabale sorting
_display.set_model (_model);
}
@ -1192,6 +1197,9 @@ EditorRegions::get_single_selection ()
void
EditorRegions::freeze_tree_model ()
{
/* store sort column id and type for later */
_model->get_sort_column_id (_sort_col_id, _sort_type);
_change_connection.block (true);
_display.set_model (Glib::RefPtr<Gtk::TreeStore> (0));
_model->set_sort_column (-2, SORT_ASCENDING); //Disable sorting to gain performance
}
@ -1199,8 +1207,9 @@ EditorRegions::freeze_tree_model ()
void
EditorRegions::thaw_tree_model ()
{
_model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
_model->set_sort_column (_sort_col_id, _sort_type); // re-enabale sorting
_display.set_model (_model);
_change_connection.block (false);
}
void

3
gtk2_ardour/editor_regions.h
View File

@ -126,6 +126,9 @@ private:
sigc::connection _change_connection;
int _sort_col_id;
Gtk::SortType _sort_type;
bool selection_filter (const Glib::RefPtr<Gtk::TreeModel>& model, const Gtk::TreeModel::Path& path, bool yn);
Gtk::Widget* old_focus;

17
gtk2_ardour/editor_sources.cc
View File

@ -508,6 +508,10 @@ EditorSources::add_source (boost::shared_ptr<ARDOUR::Region> region)
void
EditorSources::regions_changed (boost::shared_ptr<ARDOUR::RegionList> rl, PBD::PropertyChange const &)
{
bool freeze = rl->size () > 2;
if (freeze) {
freeze_tree_model ();
}
for (RegionList::const_iterator r = rl->begin (); r != rl->end(); ++r) {
boost::shared_ptr<Region> region = *r;
@ -527,6 +531,9 @@ EditorSources::regions_changed (boost::shared_ptr<ARDOUR::RegionList> rl, PBD::P
}
}
}
if (freeze) {
thaw_tree_model ();
}
}
void
@ -953,15 +960,19 @@ EditorSources::get_single_selection ()
void
EditorSources::freeze_tree_model ()
{
/* store sort column id and type for later */
_model->get_sort_column_id (_sort_col_id, _sort_type);
_change_connection.block (true);
_display.set_model (Glib::RefPtr<Gtk::TreeStore>(0));
_model->set_sort_column (-2, SORT_ASCENDING); // Disable sorting to gain performance
}
void
EditorSources::thaw_tree_model (){
_model->set_sort_column (0, SORT_ASCENDING); // renabale sorting
EditorSources::thaw_tree_model ()
{
_model->set_sort_column (_sort_col_id, _sort_type); // re-enabale sorting
_display.set_model (_model);
_change_connection.block (false);
}
XMLNode &

3
gtk2_ardour/editor_sources.h
View File

@ -98,6 +98,9 @@ private:
sigc::connection _change_connection;
int _sort_col_id;
Gtk::SortType _sort_type;
Gtk::Widget* old_focus;
Gtk::CellEditable* tags_editable;