projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes for vicons checkin
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.0/cinelerra/edl.C
b/cinelerra-5.0/cinelerra/edl.C
index 8085c77eabebee3bbb79c9b66bc45e894cafd0ea..8ef59f2bf984b1301dbf9bf02c5f6b5591b69c3c 100644
(file)
--- a/
cinelerra-5.0/cinelerra/edl.C
+++ b/
cinelerra-5.0/cinelerra/edl.C
@@
-27,7
+27,7
@@
#include "awindowgui.inc"
#include "bcsignals.h"
#include "clip.h"
#include "awindowgui.inc"
#include "bcsignals.h"
#include "clip.h"
-#include "
color
models.h"
+#include "
bcc
models.h"
#include "bchash.h"
#include "edits.h"
#include "edl.h"
#include "bchash.h"
#include "edits.h"
#include "edl.h"
@@
-394,8
+394,7
@@
int EDL::save_xml(FileXML *file,
int EDL::copy_all(EDL *edl)
{
if(this == edl) return 0;
int EDL::copy_all(EDL *edl)
{
if(this == edl) return 0;
-
- index_state->copy_from(edl->index_state);
+ update_index(edl);
nested_edls->clear();
copy_session(edl);
copy_assets(edl);
nested_edls->clear();
copy_session(edl);
copy_assets(edl);
@@
-882,8
+881,9
@@
void EDL::remove_from_project(ArrayList<EDL*> *clips)
{
if(this->clips.get(j) == clips->values[i])
{
{
if(this->clips.get(j) == clips->values[i])
{
- this->clips.get(j)->Garbage::remove_user();
- this->clips.remove(this->clips.get(j));
+ EDL *clip = this->clips.get(j);
+ this->clips.remove(clip);
+ clip->Garbage::remove_user();
}
}
}
}
}
}
@@
-1200,7
+1200,7
@@
void EDL::insert_asset(Asset *asset,
void EDL::set_index_file(Indexable *indexable)
{
void EDL::set_index_file(Indexable *indexable)
{
- if(indexable->is_asset)
+ if(indexable->is_asset)
assets->update_index((Asset*)indexable);
else
nested_edls->update_index((EDL*)indexable);
assets->update_index((Asset*)indexable);
else
nested_edls->update_index((EDL*)indexable);