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

do not add master to Mixer_UI's TreeModel - explicitly pack it and never unpack it

Browse source
This commit is contained in:
Paul Davis 2016-06-10 14:44:57 -04:00
parent 3127eeb97d
commit fbc51c03ef
1 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

39
gtk2_ardour/mixer_ui.cc
View file

@ -587,18 +587,25 @@ Mixer_UI::add_stripables (StripableList& slist)
strip->set_width_enum (_strip_width, this); strip->set_width_enum (_strip_width, this);
} }
show_strip (strip); show_strip (strip);
TreeModel::Row row = *(track_model->insert (insert_iter)); if (!route->is_master()) {
row[stripable_columns.text] = route->name(); TreeModel::Row row = *(track_model->insert (insert_iter));
row[stripable_columns.visible] = route->is_master() ? true : strip->marked_for_display();
row[stripable_columns.stripable] = route;
row[stripable_columns.strip] = strip;
if (nroutes != 0) { row[stripable_columns.text] = route->name();
_selection.add (strip); row[stripable_columns.visible] = strip->marked_for_display();
row[stripable_columns.stripable] = route;
row[stripable_columns.strip] = strip;
if (nroutes != 0) {
_selection.add (strip);
}
} else {
out_packer.pack_start (*strip, false, false);
strip->set_packed (true);
} }
strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed)); strip->WidthChanged.connect (sigc::mem_fun(*this, &Mixer_UI::strip_width_changed));
@ -1328,21 +1335,9 @@ Mixer_UI::redisplay_track_list ()
if (visible) { if (visible) {
if (strip->packed()) { if (strip->packed()) {
strip_packer.reorder_child (*strip, -1); /* put at end */
if (stripable->is_master() || stripable->is_monitor()) {
out_packer.reorder_child (*strip, -1);
} else {
strip_packer.reorder_child (*strip, -1); /* put at end */
}
} else { } else {
strip_packer.pack_start (*strip, false, false);
if (stripable->is_master() || stripable->is_monitor()) {
out_packer.pack_start (*strip, false, false);
} else {
strip_packer.pack_start (*strip, false, false);
}
strip->set_packed (true); strip->set_packed (true);
} }