plug leaks, leaker tweaks, lang for effect info, c41 spiffs, wm probe tweaks

[goodguy/history.git] / cinelerra-5.1 / cinelerra / adeviceprefs.C

diff --git a/cinelerra-5.1/cinelerra/adeviceprefs.C b/cinelerra-5.1/cinelerra/adeviceprefs.C
index eb3ccfcf32380bf58703f9325f47dbbd2913ae5e..cff01da035b300cd20338cb605cc06f1b22125d9 100644 (file)
--- a/cinelerra-5.1/cinelerra/adeviceprefs.C
+++ b/cinelerra-5.1/cinelerra/adeviceprefs.C
@@ -342,6 +342,7 @@ int ADevicePrefs::create_alsa_objs()
        int x1 = x + menu->get_w() + 5;
 
        ArrayList<char*> *alsa_titles = new ArrayList<char*>;
+       alsa_titles->set_array_delete();
        AudioALSA::list_devices(alsa_titles, 0, mode);
 
 
@@ -614,22 +615,32 @@ ADriverMenu::~ADriverMenu()
 
 void ADriverMenu::create_objects()
 {
+#ifdef HAVE_OSS
        add_item(new ADriverItem(this, AUDIO_OSS_TITLE, AUDIO_OSS));
        add_item(new ADriverItem(this, AUDIO_OSS_ENVY24_TITLE, AUDIO_OSS_ENVY24));
+#endif
 
 #ifdef HAVE_ALSA
        add_item(new ADriverItem(this, AUDIO_ALSA_TITLE, AUDIO_ALSA));
 #endif
 
+#ifdef HAVE_ESOUND
        if(!do_input) add_item(new ADriverItem(this, AUDIO_ESOUND_TITLE, AUDIO_ESOUND));
-//     add_item(new ADriverItem(this, AUDIO_NAS_TITLE, AUDIO_NAS));
+#endif
+
 #ifdef HAVE_FIREWIRE
        if(!do_input) add_item(new ADriverItem(this, AUDIO_1394_TITLE, AUDIO_1394));
        add_item(new ADriverItem(this, AUDIO_DV1394_TITLE, AUDIO_DV1394));
        add_item(new ADriverItem(this, AUDIO_IEC61883_TITLE, AUDIO_IEC61883));
 #endif
+
+#ifdef HAVE_DVB
        if(do_input) add_item(new ADriverItem(this, AUDIO_DVB_TITLE, AUDIO_DVB));
+#endif
+
+#ifdef HAVE_VIDEO4LINUX2
        if(do_input) add_item(new ADriverItem(this, AUDIO_V4L2MPEG_TITLE, AUDIO_V4L2MPEG));
+#endif
 }
 
 char* ADriverMenu::adriver_to_string(int driver)