X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fassetedit.C;h=51fa34fa4140a1f9a77c90436d2d805de0beb91d;hb=eecf057a9d6b8c8cffc7d0001bff89bc9cac7b05;hp=ce91d691ee8b868ec17d4aeabdcc4a99e5dd79e8;hpb=27fd3ea07d41d179c8fdcb5b8481960c1fcc37d5;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/assetedit.C b/cinelerra-5.1/cinelerra/assetedit.C
index ce91d691..51fa34fa 100644
--- a/cinelerra-5.1/cinelerra/assetedit.C
+++ b/cinelerra-5.1/cinelerra/assetedit.C
@@ -188,16 +188,13 @@ BC_Window* AssetEdit::new_gui()
 int AssetEdit::window_height()
 {
 	int h = 128 + 64;
-	if( indexable->have_audio() )
-		h += 180;
+	if( indexable->have_audio() ) h += 200;
 	if( indexable->have_video() ) {
-		h += 200;
+		h += 210;
 		if( indexable->is_asset ) {
 			Asset *asset = (Asset *)indexable;
 			if( asset->format == FILE_MPEG ||
-			    asset->format == FILE_FFMPEG ) {
-				h += 40;
-			}
+			    asset->format == FILE_FFMPEG ) h += 42;
 		}
 	}
 	return h;
@@ -275,8 +272,7 @@ void AssetEditWindow::create_objects()
 	if( asset ) {
 		add_subwindow(new BC_Title(x, y, _("File format:")));
 		x = x2;
-		add_subwindow(new BC_Title(x, y, File::formattostr(mwindow->plugindb,
-				asset->format),
+		add_subwindow(new BC_Title(x, y, File::formattostr(asset->format),
 			MEDIUMFONT,
 			mwindow->theme->assetedit_color));
 		x = x1;
@@ -565,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);
 }
 
@@ -875,27 +871,6 @@ 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(fwindow->mwindow->plugindb,
-		get_selection(0, 0)->get_text());
-	return 1;
-}
-
-
-
-
 DetailAssetButton::DetailAssetButton(AssetEditWindow *fwindow, int x, int y)
  : BC_GenericButton(x, y, _("Detail"))
 {