add sliders to cwdw proj/cam tools, edit id tweaks, deltrk shortcut tweak

[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 f5a06bbf0dd54db600879661d7aa820acf93b6c6..72f179907fe8758143b7337b7491e06dd283f7f9 100644 (file)
--- a/cinelerra-5.1/cinelerra/edit.C
+++ b/cinelerra-5.1/cinelerra/edit.C
@@ -279,6 +279,12 @@ void Edit::copy_from(Edit *edit)
        this->channel = edit->channel;
 }
 
+void Edit::clone_from(Edit *edit)
+{
+       copy_from(edit);
+       edit->orig_id = edit->id;
+}
+
 void Edit::equivalent_output(Edit *edit, int64_t *result)
 {
 // End of edit changed
@@ -320,13 +326,6 @@ 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);
@@ -346,11 +345,6 @@ 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();
@@ -386,8 +380,8 @@ int Edit::picon_h()
 int Edit::dump(FILE *fp)
 {
        fprintf(fp,"     EDIT %p\n", this); fflush(fp);
-       fprintf(fp,"      nested_edl=%p %s asset=%p %s\n",
-               nested_edl, nested_edl ? nested_edl->path : "",
+       fprintf(fp,"      id %d, orig_id %d, nested_edl=%p %s asset=%p %s\n",
+               id, orig_id, nested_edl, nested_edl ? nested_edl->path : "",
                asset, asset ? asset->path : "");
        fflush(fp);
        fprintf(fp,"      channel %d, color %08x, hard lt/rt %d/%d"