a/v per track data height, boxblur power fix, add french expanders

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

diff --git a/cinelerra-5.1/cinelerra/edit.C b/cinelerra-5.1/cinelerra/edit.C
index 72f179907fe8758143b7337b7491e06dd283f7f9..f06194f8a1de251b2472662176155ac76a1efeaa 100644 (file)
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -85,7 +85,6 @@ void Edit::reset()
        channel = 0;
        user_title[0] = 0;
        nested_edl = 0;
-       is_plugin = 0;
        is_selected = 0;
        hard_left = 0;
        hard_right = 0;
@@ -326,6 +325,13 @@ void Edit::equivalent_output(Edit *edit, int64_t *result)
 }
 
 
+Edit& Edit::operator=(Edit& edit)
+{
+//printf("Edit::operator= called\n");
+       copy_from(&edit);
+       return *this;
+}
+
 void Edit::synchronize_params(Edit *edit)
 {
        copy_from(edit);
@@ -345,6 +351,11 @@ int Edit::identical(Edit &edit)
        return result;
 }
 
+int Edit::operator==(Edit &edit)
+{
+       return identical(edit);
+}
+
 double Edit::frames_per_picon()
 {
        return Units::round(picon_w()) / frame_w();
@@ -368,12 +379,12 @@ double Edit::picon_w()
                w = nested_edl->session->output_w;
                h = nested_edl->session->output_h;
        }
-       return w>0 && h>0 ? ((double)edl->local_session->zoom_track*w)/h : 0;
+       return w>0 && h>0 ? ((double)track->data_h*w)/h : 0;
 }
 
 int Edit::picon_h()
 {
-       return edl->local_session->zoom_track;
+       return track->data_h;
 }