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

correctly display region sync points in the editor region list, when they change

Browse source
This commit is contained in:
Paul Davis 2017-01-10 10:26:23 +00:00
parent bcbe8424ad
commit b64dcbb36f
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gtk2_ardour/editor_regions.cc
View file

@ -96,14 +96,11 @@ EditorRegions::EditorRegions (Editor* e)
_model->set_sort_column (0, SORT_ASCENDING); _model->set_sort_column (0, SORT_ASCENDING);
/* column widths */ /* column widths */
int bbt_width, sync_width, check_width, height; int bbt_width, check_width, height;
Glib::RefPtr<Pango::Layout> layout = _display.create_pango_layout (X_("000|000|000")); Glib::RefPtr<Pango::Layout> layout = _display.create_pango_layout (X_("000|000|000"));
Gtkmm2ext::get_pixel_size (layout, bbt_width, height); Gtkmm2ext::get_pixel_size (layout, bbt_width, height);
layout = _display.create_pango_layout (X_("Start "));
Gtkmm2ext::get_pixel_size (layout, sync_width, height);
check_width = 20; check_width = 20;
TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name)); TreeViewColumn* col_name = manage (new TreeViewColumn ("", _columns.name));
@ -119,7 +116,7 @@ EditorRegions::EditorRegions (Editor* e)
col_length->set_fixed_width (bbt_width); col_length->set_fixed_width (bbt_width);
col_length->set_sizing (TREE_VIEW_COLUMN_FIXED); col_length->set_sizing (TREE_VIEW_COLUMN_FIXED);
TreeViewColumn* col_sync = manage (new TreeViewColumn ("", _columns.sync)); TreeViewColumn* col_sync = manage (new TreeViewColumn ("", _columns.sync));
col_sync->set_fixed_width (sync_width); col_sync->set_fixed_width (bbt_width);
col_sync->set_sizing (TREE_VIEW_COLUMN_FIXED); col_sync->set_sizing (TREE_VIEW_COLUMN_FIXED);
TreeViewColumn* col_fadein = manage (new TreeViewColumn ("", _columns.fadein)); TreeViewColumn* col_fadein = manage (new TreeViewColumn ("", _columns.fadein));
col_fadein->set_fixed_width (bbt_width); col_fadein->set_fixed_width (bbt_width);
@ -522,6 +519,7 @@ EditorRegions::region_changed (boost::shared_ptr<Region> r, const PropertyChange
our_interests.add (ARDOUR::Properties::position); our_interests.add (ARDOUR::Properties::position);
our_interests.add (ARDOUR::Properties::length); our_interests.add (ARDOUR::Properties::length);
our_interests.add (ARDOUR::Properties::start); our_interests.add (ARDOUR::Properties::start);
our_interests.add (ARDOUR::Properties::sync_position);
our_interests.add (ARDOUR::Properties::locked); our_interests.add (ARDOUR::Properties::locked);
our_interests.add (ARDOUR::Properties::position_lock_style); our_interests.add (ARDOUR::Properties::position_lock_style);
our_interests.add (ARDOUR::Properties::muted); our_interests.add (ARDOUR::Properties::muted);
@ -800,7 +798,7 @@ EditorRegions::populate_row (boost::shared_ptr<Region> region, TreeModel::Row co
if (all || what_changed.contains (Properties::position)) { if (all || what_changed.contains (Properties::position)) {
populate_row_position (region, row, used); populate_row_position (region, row, used);
} }
if (all || what_changed.contains (Properties::start)) { if (all || what_changed.contains (Properties::start) || what_changed.contains (Properties::sync_position)) {
populate_row_sync (region, row, used); populate_row_sync (region, row, used);
} }
if (all || what_changed.contains (Properties::fade_in)) { if (all || what_changed.contains (Properties::fade_in)) {