projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
undo/redo mixer, freds vp9, next/prev kfrm, ruleof3rds
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
assetpopup.C
diff --git
a/cinelerra-5.1/cinelerra/assetpopup.C
b/cinelerra-5.1/cinelerra/assetpopup.C
index 175494b5a3535c0f9e94825a2f5b7d1531115af3..47cc7f2ada894d6fc01dc66307d3c29b7d631fdf 100644
(file)
--- a/
cinelerra-5.1/cinelerra/assetpopup.C
+++ b/
cinelerra-5.1/cinelerra/assetpopup.C
@@
-271,6
+271,8
@@
AssetPopupMixer::~AssetPopupMixer()
int AssetPopupMixer::handle_event()
{
int AssetPopupMixer::handle_event()
{
+ ArrayList<ZWindow *>new_mixers;
+
mwindow->select_zwindow(0);
for( int i=0; i<mwindow->session->drag_assets->total; ++i ) {
Indexable *indexable = mwindow->session->drag_assets->values[i];
mwindow->select_zwindow(0);
for( int i=0; i<mwindow->session->drag_assets->total; ++i ) {
Indexable *indexable = mwindow->session->drag_assets->values[i];
@@
-293,9
+295,14
@@
int AssetPopupMixer::handle_event()
char *tp = strrchr(path, '/');
if( !tp ) tp = path; else ++tp;
zwindow->set_title(tp);
char *tp = strrchr(path, '/');
if( !tp ) tp = path; else ++tp;
zwindow->set_title(tp);
-
zwindow->start(
);
+
new_mixers.append(zwindow
);
}
}
- mwindow->queue_mixers(mwindow->edl,CURRENT_FRAME,0,0,1,0);
+
+ mwindow->tile_mixers();
+ for( int i=0; i<new_mixers.size(); ++i )
+ new_mixers[i]->start();
+
+ mwindow->refresh_mixers();
mwindow->resync_guis();
return 1;
}
mwindow->resync_guis();
return 1;
}