xfades in combined regions seem to work
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 May 2011 18:23:01 +0000 (18:23 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 17 May 2011 18:23:01 +0000 (18:23 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@9546 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/audio_playlist.cc

index e120ebb5ab15cf097bcffe078965cd9186d3e84d..d6cb85335d072f6ca09004441f4f589dcffec4e5 100644 (file)
@@ -1040,7 +1040,7 @@ AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, boost::sh
                                        */
                                        
                                        cf->second.new_out = on->second;
-                                       
+
                                } else {
                                        
                                        /* add a record of this crossfade, keeping an association
@@ -1074,9 +1074,7 @@ AudioPlaylist::copy_dependents (const vector<TwoRegions>& old_and_new, boost::sh
                
                /* add it at the right position */
 
-               new_xfade->set_position (new_xfade->position() + (ci->second.new_in->position() - ci->second.old_in->position()), this);
-               cerr << "Add new xfade to new playlist @ " << new_xfade->position() << " len " << new_xfade->length()
-                    << " in = " << new_xfade->in()->name() << " out = " << new_xfade->out()->name() << endl;
+               new_xfade->set_position (ci->second.new_in->position(), this);
                other_audio->add_crossfade (new_xfade);
        }
 }