p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / assetedit.C

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index 0a417e4bf7175775ec737b7a79e5e3c28445c700..ad809f614e610a45a10727474fe55b6286786dfb 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -193,8 +193,8 @@ int AssetEdit::window_height()
                h += 210;
                if( indexable->is_asset ) {
                        Asset *asset = (Asset *)indexable;
-                       if( asset->format == FILE_MPEG ||
-                           asset->format == FILE_FFMPEG ) h += 42;
+                       if( File::can_scale_input(asset) )
+                               h += 42;
                }
        }
        return h;
@@ -498,7 +498,7 @@ void AssetEditWindow::create_objects()
                add_subwindow(win_height);
                y += win_height->get_h() + 5;
 
-               if( asset && (asset->format == FILE_MPEG || asset->format == FILE_FFMPEG )  ) {
+               if( asset && File::can_scale_input(asset) ) {
                        y += 5;
                        x = x1;
                        add_subwindow(new BC_Title(x, y, _("Actual width:")));
@@ -937,10 +937,12 @@ void DetailAssetWindow::create_objects()
                        break;
                }
        }
+       lock_window("DetailAssetWindow::create_objects");
        text = new BC_ScrollTextBox(this, x, y, get_w()-32, 23, info, -len);
        text->create_objects();  text->set_text_row(0);
        add_subwindow(new BC_OKButton(this));
        show_window();
+       unlock_window();
 }
 
 void DetailAssetDialog::start(Asset *asset, int x, int y)