projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add audio to proxy, and minor bug fixes
[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 07cc8eb4dd1ded8c0f336bd1616bce654247bd32..15620af7a34c35f0f5d4950a445fe0dc5fbec782 100644
(file)
--- a/
cinelerra-5.1/cinelerra/assetpopup.C
+++ b/
cinelerra-5.1/cinelerra/assetpopup.C
@@
-100,10
+100,11
@@
void AssetPopup::paste_assets()
mwindow->gui->lock_window("AssetPopup::paste_assets");
mwindow->cwindow->gui->lock_window("AssetPopup::paste_assets");
mwindow->gui->lock_window("AssetPopup::paste_assets");
mwindow->cwindow->gui->lock_window("AssetPopup::paste_assets");
- gui->collect_assets();
+ int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
+ gui->collect_assets(proxy);
mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1),
mwindow->paste_assets(mwindow->edl->local_session->get_selectionstart(1),
- mwindow->edl->tracks->first,
- 0); // do not overwrite
+ mwindow->edl->tracks->first,
0); // do not overwrite
+ mwindow->session->clear_drag_proxy();
gui->unlock_window();
mwindow->gui->unlock_window();
gui->unlock_window();
mwindow->gui->unlock_window();
@@
-140,7
+141,8
@@
void AssetPopup::match_all()
int AssetPopup::update()
{
format->update();
int AssetPopup::update()
{
format->update();
- gui->collect_assets();
+ int proxy = mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ? 1 : 0;
+ gui->collect_assets(proxy);
return 0;
}
return 0;
}