projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
descratch again reworked + icons, add agingtv plugin params, add alias chkbox in...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowedit.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowedit.C
b/cinelerra-5.1/cinelerra/mwindowedit.C
index 2366c3884cb17aa3b1b1739ecd3228fde98d56a6..142c2a3849e9f06d5098bd28401abbfa598547e0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowedit.C
+++ b/
cinelerra-5.1/cinelerra/mwindowedit.C
@@
-1207,17
+1207,16
@@
if( debug ) printf("MWindow::load_assets %d\n", __LINE__);
EDL *new_edl = new EDL;
new_edl->create_objects();
new_edl->copy_session(edl);
EDL *new_edl = new EDL;
new_edl->create_objects();
new_edl->copy_session(edl);
- new_edls.append(new_edl);
-
if( !indexable->is_asset ) {
EDL *nested_edl = (EDL*)indexable;
if( !indexable->is_asset ) {
EDL *nested_edl = (EDL*)indexable;
- new_edl->
to
_nested(nested_edl);
- new_edl->
local_session->set_clip_path(nested_edl
);
+ new_edl->
create
_nested(nested_edl);
+ new_edl->
set_path(indexable->path
);
}
else {
Asset *asset = (Asset*)indexable;
asset_to_edl(new_edl, asset);
}
}
else {
Asset *asset = (Asset*)indexable;
asset_to_edl(new_edl, asset);
}
+ new_edls.append(new_edl);
if( labels ) {
for( RecordLabel *label=labels->first; label; label=label->next ) {
if( labels ) {
for( RecordLabel *label=labels->first; label; label=label->next ) {
@@
-1559,7
+1558,7
@@
int MWindow::paste_edls(ArrayList<EDL*> *new_edls, int load_mode,
edl->add_clip(new_edl->clips[j]);
}
for( int j=0; j<new_edl->nested_edls.size(); ++j ) {
edl->add_clip(new_edl->clips[j]);
}
for( int j=0; j<new_edl->nested_edls.size(); ++j ) {
- edl->nested_edls.get_
copy
(new_edl->nested_edls[j]);
+ edl->nested_edls.get_
nested
(new_edl->nested_edls[j]);
}
if( new_edl->total_vwindow_edls() ) {
}
if( new_edl->total_vwindow_edls() ) {
@@
-1601,6
+1600,10
@@
void MWindow::paste_silence()
{
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
{
double start = edl->local_session->get_selectionstart();
double end = edl->local_session->get_selectionend();
+ if( EQUIV(start, end) ) {
+ if( edl->session->frame_rate > 0 )
+ end += 1./edl->session->frame_rate;
+ }
undo->update_undo_before();
edl->paste_silence(start, end,
edl->session->labels_follow_edits,
undo->update_undo_before();
edl->paste_silence(start, end,
edl->session->labels_follow_edits,