build version update

[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 bb0e2a339317d3c5d5c197672b50816e45316191..d39aaa13e5c96be7ce326c0119bb8c2c1a402bb8 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -300,39 +300,9 @@ AssetPopupMixer::~AssetPopupMixer()
 
 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];
-               ArrayList<Indexable*> new_assets;
-               new_assets.append(indexable);
-               Track *track = mwindow->edl->tracks->last;
-               mwindow->load_assets(&new_assets, -1, LOADMODE_NEW_TRACKS, 0, 0, 0, 0, 0, 0);
-               track = !track ? mwindow->edl->tracks->first : track->next;
-               Mixer *mixer = 0;
-               ZWindow *zwindow = mwindow->get_mixer(mixer);
-               while( track ) {
-                       track->play = track->record = 0;
-                       if( track->data_type == TRACK_VIDEO ) {
-                               sprintf(track->title, _("Mixer %d"), zwindow->idx);
-                       }
-                       mixer->mixer_ids.append(track->get_mixer_id());
-                       track = track->next;
-               }
-               char *path = indexable->path;
-               char *tp = strrchr(path, '/');
-               if( !tp ) tp = path; else ++tp;
-               zwindow->set_title(tp);
-               new_mixers.append(zwindow);
-       }
-
-       mwindow->tile_mixers();
-       for( int i=0; i<new_mixers.size(); ++i )
-               new_mixers[i]->start();
-
-       mwindow->refresh_mixers();
-       mwindow->resync_guis();
+       mwindow->gui->lock_window("AssetPopupMixer::handle_event");
+       mwindow->create_mixers();
+       mwindow->gui->unlock_window();
        return 1;
 }
 
@@ -460,12 +430,14 @@ void AssetListMenu::create_objects()
        snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("png"),  SNAPSHOT_PNG));
        snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("jpeg"), SNAPSHOT_JPEG));
        snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("tiff"), SNAPSHOT_TIFF));
+       snapshot_submenu->add_submenuitem(new SnapshotMenuItem(snapshot_submenu, _("ppm"),  SNAPSHOT_PPM));
        GrabshotSubMenu *grabshot_submenu;
        add_item(asset_grabshot = new AssetGrabshot(mwindow, this));
        asset_grabshot->add_submenu(grabshot_submenu = new GrabshotSubMenu(asset_grabshot));
        grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("png"),  GRABSHOT_PNG));
        grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("jpeg"), GRABSHOT_JPEG));
        grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("tiff"), GRABSHOT_TIFF));
+       grabshot_submenu->add_submenuitem(new GrabshotMenuItem(grabshot_submenu, _("ppm"),  GRABSHOT_PPM));
        update_titles(shots_displayed = 1);
 }
 
@@ -777,7 +749,7 @@ int SnapshotMenuItem::handle_event()
 
        Preferences *preferences = mwindow->preferences;
        char filename[BCTEXTLEN];
-       static const char *exts[] = { "png", "jpg", "tif" };
+       static const char *exts[] = { "png", "jpg", "tif", "ppm" };
        time_t tt;     time(&tt);
        struct tm tm;  localtime_r(&tt,&tm);
        snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s",
@@ -802,6 +774,9 @@ int SnapshotMenuItem::handle_event()
                asset->tiff_cmodel = 0;
                asset->tiff_compression = 0;
                break;
+       case SNAPSHOT_PPM:
+               asset->format = FILE_PPM;
+               break;
        }
        asset->width = fw;
        asset->height = fh;
@@ -994,7 +969,7 @@ int GrabshotPopup::grab_event(XEvent *event)
        MWindow *mwindow = grab_thread->mwindow;
        Preferences *preferences = mwindow->preferences;
        char filename[BCTEXTLEN];
-       static const char *exts[] = { "png", "jpg", "tif" };
+       static const char *exts[] = { "png", "jpg", "tif", "ppm" };
        time_t tt;     time(&tt);
        struct tm tm;  localtime_r(&tt,&tm);
        snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s",
@@ -1004,19 +979,22 @@ int GrabshotPopup::grab_event(XEvent *event)
 
        Asset *asset = new Asset(filename);
        switch( mode ) {
-       case SNAPSHOT_PNG:
+       case GRABSHOT_PNG:
                asset->format = FILE_PNG;
                asset->png_use_alpha = 1;
                break;
-       case SNAPSHOT_JPEG:
+       case GRABSHOT_JPEG:
                asset->format = FILE_JPEG;
                asset->jpeg_quality = 90;
                break;
-       case SNAPSHOT_TIFF:
+       case GRABSHOT_TIFF:
                asset->format = FILE_TIFF;
                asset->tiff_cmodel = 0;
                asset->tiff_compression = 0;
                break;
+       case GRABSHOT_PPM:
+               asset->format = FILE_PPM;
+               break;
        }
 // no odd dimensions
        int rw = get_root_w(0), rh = get_root_h(0);