Always use "OpenAL Soft" for the short device enumeration list

13 files changed, 0 insertions, 72 deletions

diff --git a/Alc/backends/alsa.c b/Alc/backends/alsa.c
index e86d4fc5..193152fb 100644
--- a/Alc/backends/alsa.c
+++ b/Alc/backends/alsa.c
@@ -1117,10 +1117,6 @@ void alc_alsa_probe(enum DevProbe type)
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(alsaDevice);
-            break;
-
         case ALL_DEVICE_PROBE:
             for(i = 0;i < numDevNames;++i)
                 free(allDevNameMap[i].device);
diff --git a/Alc/backends/coreaudio.c b/Alc/backends/coreaudio.c
index 0a1c1e76..15c08ef6 100644
--- a/Alc/backends/coreaudio.c
+++ b/Alc/backends/coreaudio.c
@@ -668,9 +668,6 @@ void alc_ca_probe(enum DevProbe type)
 {
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(ca_device);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(ca_device);
             break;
diff --git a/Alc/backends/dsound.c b/Alc/backends/dsound.c
index 51fd8d9b..e2375137 100644
--- a/Alc/backends/dsound.c
+++ b/Alc/backends/dsound.c
@@ -929,10 +929,6 @@ void alcDSoundProbe(enum DevProbe type)
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(dsDevice);
-            break;
-
         case ALL_DEVICE_PROBE:
             for(i = 0;i < NumPlaybackDevices;++i)
                 free(PlaybackDeviceList[i].name);
diff --git a/Alc/backends/mmdevapi.c b/Alc/backends/mmdevapi.c
index c4679f85..59068406 100644
--- a/Alc/backends/mmdevapi.c
+++ b/Alc/backends/mmdevapi.c
@@ -987,10 +987,6 @@ void alcMMDevApiProbe(enum DevProbe type)
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(mmDevice);
-            break;
-
         case ALL_DEVICE_PROBE:
             req.FinishedEvt = CreateEvent(NULL, FALSE, FALSE, NULL);
             if(req.FinishedEvt == NULL)
diff --git a/Alc/backends/null.c b/Alc/backends/null.c
index 7b501b58..8e581f15 100644
--- a/Alc/backends/null.c
+++ b/Alc/backends/null.c
@@ -152,9 +152,6 @@ void alc_null_probe(enum DevProbe type)
 {
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(nullDevice);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(nullDevice);
             break;
diff --git a/Alc/backends/opensl.c b/Alc/backends/opensl.c
index 405f66af..58acc828 100644
--- a/Alc/backends/opensl.c
+++ b/Alc/backends/opensl.c
@@ -410,9 +410,6 @@ void alc_opensl_probe(enum DevProbe type)
 {
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(opensl_device);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(opensl_device);
             break;
diff --git a/Alc/backends/oss.c b/Alc/backends/oss.c
index 0e4a5393..21c62d13 100644
--- a/Alc/backends/oss.c
+++ b/Alc/backends/oss.c
@@ -500,16 +500,6 @@ void alc_oss_probe(enum DevProbe type)
 {
     switch(type)
     {
-        case DEVICE_PROBE:
-        {
-#ifdef HAVE_STAT
-            struct stat buf;
-            if(stat(GetConfigValue("oss", "device", "/dev/dsp"), &buf) == 0)
-#endif
-                AppendDeviceList(oss_device);
-        }
-        break;
-
         case ALL_DEVICE_PROBE:
         {
 #ifdef HAVE_STAT
diff --git a/Alc/backends/portaudio.c b/Alc/backends/portaudio.c
index bd3bb4d8..2ac668b8 100644
--- a/Alc/backends/portaudio.c
+++ b/Alc/backends/portaudio.c
@@ -438,9 +438,6 @@ void alc_pa_probe(enum DevProbe type)
 {
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(pa_device);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(pa_device);
             break;
diff --git a/Alc/backends/pulseaudio.c b/Alc/backends/pulseaudio.c
index 6100d59f..1e4086e1 100644
--- a/Alc/backends/pulseaudio.c
+++ b/Alc/backends/pulseaudio.c
@@ -1365,33 +1365,10 @@ void alc_pulse_deinit(void) //{{{
 
 void alc_pulse_probe(enum DevProbe type) //{{{
 {
-    pa_threaded_mainloop *loop;
     ALuint i;
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            if((loop=pa_threaded_mainloop_new()) &&
-               pa_threaded_mainloop_start(loop) >= 0)
-            {
-                pa_context *context;
-
-                pa_threaded_mainloop_lock(loop);
-                context = connect_context(loop, AL_FALSE);
-                if(context)
-                {
-                    AppendDeviceList(pulse_device);
-
-                    pa_context_disconnect(context);
-                    pa_context_unref(context);
-                }
-                pa_threaded_mainloop_unlock(loop);
-                pa_threaded_mainloop_stop(loop);
-            }
-            if(loop)
-                pa_threaded_mainloop_free(loop);
-            break;
-
         case ALL_DEVICE_PROBE:
             for(i = 0;i < numDevNames;++i)
             {
diff --git a/Alc/backends/sndio.c b/Alc/backends/sndio.c
index af4ba387..4866a0a5 100644
--- a/Alc/backends/sndio.c
+++ b/Alc/backends/sndio.c
@@ -357,9 +357,6 @@ void alc_sndio_probe(enum DevProbe type)
 {
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(sndio_device);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(sndio_device);
             break;
diff --git a/Alc/backends/solaris.c b/Alc/backends/solaris.c
index 445ec9ef..02a6c9a5 100644
--- a/Alc/backends/solaris.c
+++ b/Alc/backends/solaris.c
@@ -268,9 +268,6 @@ void alc_solaris_probe(enum DevProbe type)
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(solaris_device);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(solaris_device);
             break;
diff --git a/Alc/backends/wave.c b/Alc/backends/wave.c
index f5c14174..5ef363d3 100644
--- a/Alc/backends/wave.c
+++ b/Alc/backends/wave.c
@@ -342,9 +342,6 @@ void alc_wave_probe(enum DevProbe type)
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            AppendDeviceList(waveDevice);
-            break;
         case ALL_DEVICE_PROBE:
             AppendAllDeviceList(waveDevice);
             break;
diff --git a/Alc/backends/winmm.c b/Alc/backends/winmm.c
index 6ca5f31d..994c073c 100644
--- a/Alc/backends/winmm.c
+++ b/Alc/backends/winmm.c
@@ -752,12 +752,6 @@ void alcWinMMProbe(enum DevProbe type)
 
     switch(type)
     {
-        case DEVICE_PROBE:
-            ProbePlaybackDevices();
-            if(NumPlaybackDevices > 0)
-                AppendDeviceList(woDefault);
-            break;
-
         case ALL_DEVICE_PROBE:
             ProbePlaybackDevices();
             if(NumPlaybackDevices > 0)