debugging legacy xfade loading, part 2

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

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index cefb5a70fd327a6f02ef7d8aeddef0c8a9e865bc..0db5d174c96a87261c32051d915832fee69a5ba3 100644 (file)
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -694,9 +694,11 @@ AudioPlaylist::set_state (const XMLNode& node, int version)
                                if ((*j)->name() == X_("FadeIn")) {
                                        in_a->fade_in()->set_state (**j, version);
                                        in_a->set_fade_in_active (true);
+                                       in_a->set_fade_in_is_xfade (true);
                                } else if ((*j)->name() == X_("FadeOut")) {
                                        out_a->fade_out()->set_state (**j, version);
                                        out_a->set_fade_out_active (true);
+                                       out_a->set_fade_out_is_xfade (true);
                                }
                        }
                }

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index fa948844abcf2adc224127a03b1115fc5f8eb555..2bc84f8988be23221a46f127d90ff5cd851f7054 100644 (file)
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -284,7 +284,9 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node)
        if (ret) {
                if (ret->set_state (node, Stateful::loading_state_version)) {
                        ret.reset ();
+                       cerr << "set state on region failed\n";
                } else {
+                       cerr << "add region " << ret->id() << " to region map\n";
                        map_add (ret);
 
                        /* Don't fiddle with position_lock_style here as the region