add ffmpeg raw pcm audio, pcm probe 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 cd3c703bf16d304ac0b1736c22ca5859c9fa40dd..d39aaa13e5c96be7ce326c0119bb8c2c1a402bb8 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -430,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);
 }
 
@@ -747,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",
@@ -772,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;
@@ -964,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",
@@ -974,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);