prevent popup deactivation while button_down

[goodguy/history.git] / cinelerra-5.0 / cinelerra / formatpopup.C

diff --git a/cinelerra-5.0/cinelerra/formatpopup.C b/cinelerra-5.0/cinelerra/formatpopup.C
index 559385189e31e4364b8774daf258fab8e2dd1c9c..dacb76cced5620bae73bf30027e85168669a1ee3 100644 (file)
--- a/cinelerra-5.0/cinelerra/formatpopup.C
+++ b/cinelerra-5.0/cinelerra/formatpopup.C
@@ -40,6 +40,8 @@ FormatPopup::FormatPopup(ArrayList<PluginServer*> *plugindb,
 
 void FormatPopup::create_objects()
 {
+       format_items.append(new BC_ListBoxItem(_(FFMPEG_NAME)));
+
        if(!use_brender)
        {
                format_items.append(new BC_ListBoxItem(_(AC3_NAME)));
@@ -53,12 +55,9 @@ void FormatPopup::create_objects()
 
        if(!use_brender)
        {
-               format_items.append(new BC_ListBoxItem(_(AVI_NAME)));
                format_items.append(new BC_ListBoxItem(_(EXR_NAME)));
                format_items.append(new BC_ListBoxItem(_(EXR_LIST_NAME)));
                format_items.append(new BC_ListBoxItem(_(WAV_NAME)));
-               format_items.append(new BC_ListBoxItem(_(MOV_NAME)));
-               format_items.append(new BC_ListBoxItem(_(FFMPEG_NAME)));
                format_items.append(new BC_ListBoxItem(_(AMPEG_NAME)));
                format_items.append(new BC_ListBoxItem(_(VMPEG_NAME)));
                format_items.append(new BC_ListBoxItem(_(OGG_NAME)));
@@ -104,7 +103,7 @@ FFMPEGPopup::FFMPEGPopup(ArrayList<PluginServer*> *plugindb, int x, int y)
 
 void FFMPEGPopup::create_objects()
 {
-       static const char *dirs[] = { "/audio", "/video", };
+       static const char *dirs[] = { "audio", "video", };
        for( int i=0; i<(int)(sizeof(dirs)/sizeof(dirs[0])); ++i ) {
                FileSystem fs;
                char option_path[BCTEXTLEN];
@@ -114,8 +113,9 @@ void FFMPEGPopup::create_objects()
                for( int j=0; j<total_files; ++j ) {
                        const char *name = fs.get_entry(j)->get_name();
                        const char *ext = strrchr(name,'.');
-                       if( !ext ) ext = name;
-                       else if( !strcmp("opts", ++ext) ) continue;
+                       if( !ext ) continue;
+                       if( !strcmp("dfl", ++ext) ) continue;
+                       if( !strcmp("opts", ext) ) continue;
                        int k = ffmpeg_types.size();
                        while( --k >= 0 && strcmp(ffmpeg_types[k]->get_text(), ext) );
                        if( k >= 0 ) continue;