X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fformatpopup.C;h=55ffcefa4b487414577f68f88f6c59acfa844385;hb=c279e21fc2394a7908bbd1ba8c79b116fe9fb14a;hp=d6ff3363c83fc12e121a29dd36605729bb29f3d0;hpb=ea0dfe3cd57bb60ef824cd0d3512fcd251020c76;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/formatpopup.C b/cinelerra-5.1/cinelerra/formatpopup.C
index d6ff3363..55ffcefa 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;
@@ -50,13 +47,16 @@ void FormatPopup::create_objects()
 {
 	if(!use_brender) {
 		post_item(FILE_FFMPEG);
+#ifdef HAVE_LIBZMPEG
 		post_item(FILE_AC3);
+#endif
 		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) {
@@ -66,29 +66,28 @@ void FormatPopup::create_objects()
 #endif
 		post_item(FILE_WAV);
 		post_item(FILE_RAWDV);
+#ifdef HAVE_LIBZMPEG
 		post_item(FILE_AMPEG);
 		post_item(FILE_VMPEG);
+#endif
 		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 +102,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"));
 }
 
@@ -132,6 +130,7 @@ void FFMPEGPopup::create_objects()
         	}
         }
 
+	BC_ListBoxItem::sort_items(ffmpeg_types);
 	update(&ffmpeg_types, 0, 0, 1);
 }