fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / formatpopup.C

diff --git a/cinelerra-5.1/cinelerra/formatpopup.C b/cinelerra-5.1/cinelerra/formatpopup.C
index 31a8bd001ee47e806fbcee84f4f56715f257e083..addd4a2c7a598dbb810a3ae99260a97cc3474bdf 100644 (file)
--- a/cinelerra-5.1/cinelerra/formatpopup.C
+++ b/cinelerra-5.1/cinelerra/formatpopup.C
@@ -28,7 +28,7 @@
 
 
 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)
+ : BC_ListBox(x, y, xS(200), yS(200), LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
 {
        this->do_audio = do_audio;
        this->do_video = do_video;
@@ -72,6 +72,10 @@ void FormatPopup::create_objects()
 #ifdef HAVE_LIBZMPEG
                post_item(FILE_AMPEG);
                post_item(FILE_VMPEG);
+#endif
+#ifdef HAVE_OGG
+               post_item(FILE_VORBIS);
+               post_item(FILE_OGG);
 #endif
                post_item(FILE_PCM);
        }
@@ -104,7 +108,7 @@ int FormatPopup::handle_event()
 
 
 FFMPEGPopup::FFMPEGPopup(int x, int y)
- : BC_ListBox(x, y, 100, 200, LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
+ : BC_ListBox(x, y, xS(100), yS(200), LISTBOX_TEXT, 0, 0, 0, 1, 0, 1)
 {
        set_tooltip(_("Set ffmpeg file type"));
 }