diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-19 18:09:08 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-02-19 18:09:08 +0000 |
| commit | fa701b8c065251d242342b86a54d91826d2290a0 (patch) | |
| tree | 106865e709c61a1d3af045a26a757b22ba423c3e /gtk2_ardour/crossfade_view.cc | |
| parent | 728bedf9b917287ea76b98860dec04e72472230c (diff) | |
change PropertyChange from a bitfield into a real object, with all the many widespread changes that causes
git-svn-id: svn://localhost/ardour2/branches/3.0@6701 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/crossfade_view.cc')
| -rw-r--r-- | gtk2_ardour/crossfade_view.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc index ca333e67a6..a861ba8e9e 100644 --- a/gtk2_ardour/crossfade_view.cc +++ b/gtk2_ardour/crossfade_view.cc @@ -82,9 +82,12 @@ CrossfadeView::CrossfadeView (ArdourCanvas::Group *parent, group->signal_event().connect (sigc::bind (sigc::mem_fun (tv.editor(), &PublicEditor::canvas_crossfade_view_event), group, this)); - crossfade_changed (PropertyChange (~0)); + PropertyChange all_crossfade_properties; + all_crossfade_properties.add (ARDOUR::Properties::active); + all_crossfade_properties.add (ARDOUR::Properties::follow_overlap); + crossfade_changed (all_crossfade_properties); - crossfade->StateChanged.connect (*this, ui_bind (&CrossfadeView::crossfade_changed, this, _1), gui_context()); + crossfade->PropertyChanged.connect (*this, ui_bind (&CrossfadeView::crossfade_changed, this, _1), gui_context()); ColorsChanged.connect (sigc::mem_fun (*this, &CrossfadeView::color_handler)); } @@ -123,11 +126,11 @@ CrossfadeView::set_height (double height) } void -CrossfadeView::crossfade_changed (PropertyChange what_changed) +CrossfadeView::crossfade_changed (const PropertyChange& what_changed) { bool need_redraw_curves = false; - if (what_changed & BoundsChanged) { + if (what_changed.contains (ARDOUR::bounds_change)) { set_position (crossfade->position(), this); set_duration (crossfade->length(), this); @@ -136,11 +139,11 @@ CrossfadeView::crossfade_changed (PropertyChange what_changed) need_redraw_curves = false; } - if (what_changed & Crossfade::FollowOverlapChanged) { + if (what_changed.contains (ARDOUR::Properties::follow_overlap)) { need_redraw_curves = true; } - if (what_changed & Crossfade::ActiveChanged) { + if (what_changed.contains (ARDOUR::Properties::active)) { /* calls redraw_curves */ active_changed (); } else if (need_redraw_curves) { |