X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformatpopup.C;h=0793e59ece6ab0db9df3fabe35cce580084af424;hb=fbb844da24c44cce0509451116df248c861ef8f7;hp=03e94dd9357a73330dda6b64140dc7c85e24674c;hpb=c2c09a4c97194b07dbd1eae82aa0226d9774f350;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/formatpopup.C b/cinelerra-5.1/cinelerra/formatpopup.C
index 03e94dd9..0793e59e 100644
--- a/cinelerra-5.1/cinelerra/formatpopup.C
+++ b/cinelerra-5.1/cinelerra/formatpopup.C
@@ -25,14 +25,11 @@
 #include "ffmpeg.h"
 #include "formatpopup.h"
 #include "language.h"
-#include "pluginserver.h"
-
 
 
 FormatPopup::FormatPopup(int x, int y, int do_audio, int do_video, int use_brender)
  : BC_ListBox(x, y, 200, 200, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
 {
-	this->plugindb = plugindb;
 	this->do_audio = do_audio;
 	this->do_video = do_video;
 	this->use_brender = use_brender;
@@ -54,9 +51,10 @@ void FormatPopup::create_objects()
 		post_item(FILE_AIFF);
 		post_item(FILE_AU);
 		post_item(FILE_FLAC);
-		post_item(FILE_JPEG);
 	}
 
+	if(!use_brender)
+		post_item(FILE_JPEG);
 	post_item(FILE_JPEG_LIST);
 
 	if(!use_brender) {
@@ -71,24 +69,21 @@ void FormatPopup::create_objects()
 		post_item(FILE_VORBIS);
 		post_item(FILE_OGG);
 		post_item(FILE_PCM);
-		post_item(FILE_PNG);
 	}
 
-	format_items.append(new BC_ListBoxItem(_(PNG_LIST_NAME)));
-
 	if(!use_brender)
-	{
-		format_items.append(new BC_ListBoxItem(_(TGA_NAME)));
-	}
-
-	format_items.append(new BC_ListBoxItem(_(TGA_LIST_NAME)));
-
+		post_item(FILE_PNG);
+	post_item(FILE_PNG_LIST);
 	if(!use_brender)
-	{
-		format_items.append(new BC_ListBoxItem(_(TIFF_NAME)));
-	}
+		post_item(FILE_PPM);
+	post_item(FILE_PPM_LIST);
+	if(!use_brender)
+		post_item(FILE_TGA);
+	post_item(FILE_TGA_LIST);
+	if(!use_brender)
+		post_item(FILE_TIFF);
+	post_item(FILE_TIFF_LIST);
 
-	format_items.append(new BC_ListBoxItem(_(TIFF_LIST_NAME)));
 	update(&format_items, 0, 0, 1);
 }
 
@@ -103,10 +98,9 @@ int FormatPopup::handle_event()
 }
 
 
-FFMPEGPopup::FFMPEGPopup(ArrayList<PluginServer*> *plugindb, int x, int y)
+FFMPEGPopup::FFMPEGPopup(int x, int y)
  : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
 {
-	this->plugindb = plugindb;
 	set_tooltip(_("Set ffmpeg file type"));
 }