trying to track down why undo doesn't remove xfade rendering on OS X

git-svn-id: svn://localhost/ardour2/branches/3.0@13102 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 83015c9f635237c4d8522f41119b0aa9dfe2261f..31a2e4ca06c979999574a0a3b81d50ade91304e8 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -267,7 +267,7 @@ void
 AudioRegionView::region_changed (const PropertyChange& what_changed)
 {
        ENSURE_GUI_THREAD (*this, &AudioRegionView::region_changed, what_changed);
-       // cerr << "AudioRegionView::region_changed() called" << endl;
+       cerr << "AudioRegionView::region_changed() called" << endl;
 
        RegionView::region_changed (what_changed);
 
@@ -275,17 +275,30 @@ AudioRegionView::region_changed (const PropertyChange& what_changed)
                region_scale_amplitude_changed ();
        }
        if (what_changed.contains (ARDOUR::Properties::fade_in)) {
+               cerr << region()->name() << " in changed\n";
+               stacktrace (cerr, 40);
                fade_in_changed ();
        }
        if (what_changed.contains (ARDOUR::Properties::fade_out)) {
+               cerr << region()->name() << " out changed\n";
                fade_out_changed ();
        }
        if (what_changed.contains (ARDOUR::Properties::fade_in_active)) {
+               cerr << region()->name() << " in active changed\n";
                fade_in_active_changed ();
        }
        if (what_changed.contains (ARDOUR::Properties::fade_out_active)) {
+               cerr << region()->name() << " out active changed\n";
                fade_out_active_changed ();
        }
+       if (what_changed.contains (ARDOUR::Properties::fade_in_is_xfade)) {
+               cerr << region()->name() << " in is xfade changed\n";
+               fade_in_changed ();
+       }
+       if (what_changed.contains (ARDOUR::Properties::fade_out_is_xfade)) {
+               cerr << region()->name() << " out is xfade changed\n";
+               fade_out_changed ();
+       }
        if (what_changed.contains (ARDOUR::Properties::envelope_active)) {
                envelope_active_changed ();
        }

diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h
index e38c98ea05fbf559328cc6dae1e90a79bf4fc337..4213dc1a6c760927852f3f6e1491133e84975833 100644 (file)
--- a/libs/ardour/ardour/audioregion.h
+++ b/libs/ardour/ardour/audioregion.h
@@ -46,6 +46,10 @@ namespace Properties {
        extern PBD::PropertyDescriptor<bool> fade_in_active;
        extern PBD::PropertyDescriptor<bool> fade_out_active;
        extern PBD::PropertyDescriptor<float> scale_amplitude;
+       extern PBD::PropertyDescriptor<bool> fade_out_is_xfade;
+       extern PBD::PropertyDescriptor<bool> fade_out_is_short;
+       extern PBD::PropertyDescriptor<bool> fade_in_is_xfade;
+       extern PBD::PropertyDescriptor<bool> fade_in_is_short;
        extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in;
        extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in;
        extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out;