open asset/clip viewers en masse

[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 238a73c694addb15f8685ecf71a89ef4971ba8ce..07cc8eb4dd1ded8c0f336bd1616bce654247bd32 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -160,10 +160,13 @@ int AssetPopupInfo::handle_event()
 {
        int cur_x, cur_y;
        popup->gui->get_abs_cursor(cur_x, cur_y);
-       if( mwindow->session->drag_assets->size() ) {
-               AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
-               asset_edit->edit_asset(
-                       mwindow->session->drag_assets->values[0], cur_x, cur_y);
+       int n = mwindow->session->drag_assets->size();
+       if( n > 0 ) {
+               for( int i=0; i<n; ++i ) {
+                       AssetEdit *asset_edit = mwindow->awindow->get_asset_editor();
+                       asset_edit->edit_asset(
+                               mwindow->session->drag_assets->values[i], cur_x-30*i, cur_y-30*i);
+               }
        }
        else if( mwindow->session->drag_clips->size() ) {
                popup->gui->awindow->clip_edit->edit_clip(
@@ -267,18 +270,18 @@ AssetPopupViewWindow::~AssetPopupViewWindow()
 
 int AssetPopupViewWindow::handle_event()
 {
-// Find window with nothing
-       VWindow *vwindow = mwindow->get_viewer(1);
-
-// TODO: create new vwindow or change current vwindow
-       if( mwindow->session->drag_assets->total )
-               vwindow->change_source(
-                       mwindow->session->drag_assets->values[0]);
-       else
-       if( mwindow->session->drag_clips->total )
-               vwindow->change_source(
-                       mwindow->session->drag_clips->values[0]);
-
+       for( int i=0; i<mwindow->session->drag_assets->size(); ++i ) {
+               VWindow *vwindow = mwindow->get_viewer(1);
+               vwindow->gui->lock_window("AssetPopupView::handle_event 1");
+               vwindow->change_source(mwindow->session->drag_assets->get(i));
+               vwindow->gui->unlock_window();
+       }
+       for( int i=0; i<mwindow->session->drag_clips->size(); ++i ) {
+               VWindow *vwindow = mwindow->get_viewer(1);
+               vwindow->gui->lock_window("AssetPopupView::handle_event 2");
+               vwindow->change_source(mwindow->session->drag_clips->get(i));
+               vwindow->gui->unlock_window();
+       }
        return 1;
 }