X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetedit.C;h=4df0f70a40ec52b27e363ae182d35b87146060a2;hp=dc43432c413067dd7fc0b60ae70830d10bde1ecf;hb=HEAD;hpb=e5d1c3ec8b49e9e4cd31f30e991f52ab11de93b1

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index dc43432c..4df0f70a 100644
--- 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:")));
@@ -561,7 +561,7 @@ void AssetEditWindow::create_objects()
 void AssetEditWindow::show_info_detail()
 {
 	int cur_x, cur_y;
-	get_abs_cursor_xy(cur_x, cur_y, 0);
+	get_abs_cursor(cur_x, cur_y, 0);
 	detail_dialog->start((Asset*)asset_edit->indexable, cur_x, cur_y);
 }
 
@@ -871,31 +871,10 @@ AssetEditPath::~AssetEditPath() {}
 
 
 
-
-
-AssetEditFormat::AssetEditFormat(AssetEditWindow *fwindow, char* default_, int y)
- : FormatPopup(fwindow->mwindow->plugindb, 90, y)
-{
-	this->fwindow = fwindow;
-}
-AssetEditFormat::~AssetEditFormat()
-{
-}
-int AssetEditFormat::handle_event()
-{
-	Asset *asset = fwindow->asset_edit->changed_params;
-	asset->format = File::strtoformat(get_selection(0, 0)->get_text());
-	return 1;
-}
-
-
-
-
 DetailAssetButton::DetailAssetButton(AssetEditWindow *fwindow, int x, int y)
  : BC_GenericButton(x, y, _("Detail"))
 {
 	this->fwindow = fwindow;
-	set_underline(0);
 }
 
 DetailAssetButton::~DetailAssetButton()
@@ -947,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)