projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ids to auto/labels, fix awdw gui deadlock, fix fourier bfr bug, fix cache critica...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
auto.C
diff --git
a/cinelerra-5.1/cinelerra/auto.C
b/cinelerra-5.1/cinelerra/auto.C
index 4171fa83d18338a46897ff2877852550279ab9ca..03d4aa016eb5d72b67122f79554e0f9ae8aad314 100644
(file)
--- a/
cinelerra-5.1/cinelerra/auto.C
+++ b/
cinelerra-5.1/cinelerra/auto.C
@@
-21,6
+21,7
@@
#include "auto.h"
#include "autos.h"
#include "auto.h"
#include "autos.h"
+#include "edl.h"
#include "filexml.h"
Auto::Auto()
#include "filexml.h"
Auto::Auto()
@@
-29,10
+30,11
@@
Auto::Auto()
this->edl = 0;
this->autos = 0;
position = 0;
this->edl = 0;
this->autos = 0;
position = 0;
- skip = 0;
WIDTH = xS(10);
HEIGHT = yS(10);
is_default = 0;
WIDTH = xS(10);
HEIGHT = yS(10);
is_default = 0;
+ id = EDL::next_id();
+ orig_id = id;
}
Auto::Auto(EDL *edl, Autos *autos)
}
Auto::Auto(EDL *edl, Autos *autos)
@@
-41,10
+43,11
@@
Auto::Auto(EDL *edl, Autos *autos)
this->edl = edl;
this->autos = autos;
position = 0;
this->edl = edl;
this->autos = autos;
position = 0;
- skip = 0;
WIDTH = xS(10);
HEIGHT = yS(10);
is_default = 0;
WIDTH = xS(10);
HEIGHT = yS(10);
is_default = 0;
+ id = EDL::next_id();
+ orig_id = id;
}
Auto& Auto::operator=(Auto& that)
}
Auto& Auto::operator=(Auto& that)
@@
-66,6
+69,7
@@
void Auto::copy(int64_t start, int64_t end, FileXML *file, int default_only)
void Auto::copy_from(Auto *that)
{
void Auto::copy_from(Auto *that)
{
+ this->orig_id = orig_id;
this->position = that->position;
}
this->position = that->position;
}