fix transition keyframe update when autogenerate keyframes set, revert copy operators...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / edits.C

diff --git a/cinelerra-5.1/cinelerra/edits.C b/cinelerra-5.1/cinelerra/edits.C
index ea67b6cb976fa8783d458dc262e0945508e842ca..de93e5830d351d41ce3cd68e7a489f999e2c1312 100644 (file)
--- a/cinelerra-5.1/cinelerra/edits.C
+++ b/cinelerra-5.1/cinelerra/edits.C
@@ -102,6 +102,15 @@ void Edits::copy_from(Edits *edits)
        }
 }
 
+
+Edits& Edits::operator=(Edits& edits)
+{
+printf("Edits::operator= 1\n");
+       copy_from(&edits);
+       return *this;
+}
+
+
 void Edits::insert_asset(Asset *asset, EDL *nested_edl,
        int64_t length, int64_t position, int track_number)
 {
@@ -403,8 +412,8 @@ int Edits::optimize()
                                if( is_glitch(next_edit) )
                                        break;
 // both edits are silence & not a plugin
-                               if( !current->is_plugin && current->silence() &&
-                                   !next_edit->is_plugin && next_edit->silence() )
+                               if( !current->is_plugin() && current->silence() &&
+                                   !next_edit->is_plugin() && next_edit->silence() )
                                        break;
 // source channels are identical & assets are identical
                                if( !result && current->channel == next_edit->channel &&