projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework undo compression, add shift viewer overwr/copy/clip/splice, fix paste edl...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
clippopup.C
diff --git
a/cinelerra-5.1/cinelerra/clippopup.C
b/cinelerra-5.1/cinelerra/clippopup.C
index db11a158ec7cf06493224dcb31c5fa7bd5bb62bc..dd73896330963ebdd431aaf67b58155b3a704fd0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/clippopup.C
+++ b/
cinelerra-5.1/cinelerra/clippopup.C
@@
-253,10
+253,14
@@
int ClipPopupCopy::handle_event()
MWindowGUI *gui = mwindow->gui;
gui->lock_window("ClipPopupCopy::handle_event");
if( mwindow->session->drag_clips->total > 0 ) {
MWindowGUI *gui = mwindow->gui;
gui->lock_window("ClipPopupCopy::handle_event");
if( mwindow->session->drag_clips->total > 0 ) {
- FileXML file;
EDL *edl = mwindow->session->drag_clips->values[0];
EDL *edl = mwindow->session->drag_clips->values[0];
+ EDL *copy_edl = new EDL; // no parent or assets wont be copied
+ copy_edl->create_objects();
+ copy_edl->copy_all(edl);
+ FileXML file;
double start = 0, end = edl->tracks->total_length();
double start = 0, end = edl->tracks->total_length();
- edl->copy(start, end, 1, &file, "", 1);
+ copy_edl->copy(start, end, 1, &file, "", 1);
+ copy_edl->remove_user();
const char *file_string = file.string();
long file_length = strlen(file_string);
gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
const char *file_string = file.string();
long file_length = strlen(file_string);
gui->to_clipboard(file_string, file_length, SECONDARY_SELECTION);
@@
-449,6
+453,10
@@
int ClipPopupNest::handle_event()
dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
clip_edl->set_path(path);
dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
clip_edl->set_path(path);
+ sprintf(new_clip->local_session->clip_icon,
+ "clip_%02d%02d%02d-%02d%02d%02d.png",
+ dtm.tm_year+1900, dtm.tm_mon+1, dtm.tm_mday,
+ dtm.tm_hour, dtm.tm_min, dtm.tm_sec);
new_clip->set_path(path);
new_clip->to_nested(clip_edl);
int idx = edl->clips.number_of(clip);
new_clip->set_path(path);
new_clip->to_nested(clip_edl);
int idx = edl->clips.number_of(clip);
@@
-506,7
+514,6
@@
int ClipPopupUnNest::handle_event()
}
else
edl->clips.append(new_clip);
}
else
edl->clips.append(new_clip);
- edl->clips.add_clip(new_clip);
popup->gui->async_update_assets();
}
}
popup->gui->async_update_assets();
}
}