repair default keyframe load, tweak init default histogram threshold

[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 51fa34fa4140a1f9a77c90436d2d805de0beb91d..4df0f70a40ec52b27e363ae182d35b87146060a2 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:")));
@@ -875,7 +875,6 @@ DetailAssetButton::DetailAssetButton(AssetEditWindow *fwindow, int x, int y)
  : BC_GenericButton(x, y, _("Detail"))
 {
        this->fwindow = fwindow;
-       set_underline(0);
 }
 
 DetailAssetButton::~DetailAssetButton()
@@ -927,18 +926,22 @@ void DetailAssetWindow::create_objects()
        strncpy(info,_("no info available"),len);
        if( !mwindow->preferences->get_asset_file_path(asset, file_name) ) {
                switch( asset->format ) {
+#ifdef HAVE_LIBZMPEG
                case FILE_MPEG:
                        FileMPEG::get_info(asset->path, file_name, &info[0],len);
                        break;
+#endif
                case FILE_FFMPEG:
                        FileFFMPEG::get_info(asset->path, &info[0],len);
                        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)