Maarten Lankhorst : winmm: Set default sound driver to alsa, oss, coreaudio.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d322d63b10b4a71f4d71f43e83d0c1b4d20c7414
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d322d63b10b4a71f4d71f43e83...

Author: Maarten Lankhorst 
Date:   Mon Oct  8 20:11:13 2007 +0200

winmm: Set default sound driver to alsa,oss,coreaudio.

---

dlls/winmm/winemm.h      |    2 +-
 programs/winecfg/audio.c |   40 ++++++----------------------------------
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h
index 72de79a..805ad83 100644
--- a/dlls/winmm/winemm.h
+++ b/dlls/winmm/winemm.h
@@ -25,7 +25,7 @@
 #include "winbase.h"
 #include "mmddk.h"

-#define WINE_DEFAULT_WINMM_DRIVER     "oss"
+#define WINE_DEFAULT_WINMM_DRIVER     "alsa,oss,coreaudio"
 #define WINE_DEFAULT_WINMM_MAPPER     "msacm32.drv"
 #define WINE_DEFAULT_WINMM_MIDI       "midimap.dll"

diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 89fee96..39b3b07 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -82,12 +82,12 @@ static const char* DSound_Bits[] = {

static const AUDIO_DRIVER sAudioDrivers[] = {
   {IDS_DRIVER_ALSA,      "alsa"},
-  {IDS_DRIVER_ESOUND,    "esd"},
   {IDS_DRIVER_OSS,       "oss"},
+  {IDS_DRIVER_COREAUDIO, "coreaudio"},
   {IDS_DRIVER_JACK,      "jack"},
   {IDS_DRIVER_NAS,       "nas"},
+  {IDS_DRIVER_ESOUND,    "esd"},
   {IDS_DRIVER_AUDIOIO,   "audioio"},
-  {IDS_DRIVER_COREAUDIO, "coreaudio"},
   {0, ""}
 };

@@ -623,41 +623,13 @@ static void initAudioDlg (HWND hDlg)
     buf = get_reg_key(config_key, "Drivers", "Audio", NULL);

/* check for first time install and set a default driver
-     * select in this order: oss, alsa, first available driver, none
+     * select first available driver, and if that fails: none
      */
     if (buf == NULL)
     {
-        const AUDIO_DRIVER *pAudioDrv = NULL;
-
-        /* select oss if available */
-        for (pAudioDrv = loadedAudioDrv; pAudioDrv->nameID; pAudioDrv++)
-        {
-            if (strcmp(pAudioDrv->szDriver, "oss") == 0)
-            {
-                selectDriver(hDlg, "oss");
-                break;
-            }
-        }
-
-        if (strlen(curAudioDriver) == 0)
-        {
-            /* select alsa if available */
-            for (pAudioDrv = loadedAudioDrv; pAudioDrv->nameID; pAudioDrv++)
-            {
-                if (strcmp(pAudioDrv->szDriver, "alsa") == 0)
-                {
-                    selectDriver(hDlg, "alsa");
-                    break;
-                }
-            }
-        }
-
-        if (strlen(curAudioDriver) == 0)
-        {
-            /* select first available driver */
-            if (*loadedAudioDrv->szDriver)
-                selectDriver(hDlg, loadedAudioDrv->szDriver);
-        }
+        /* select first available driver */
+        if (*loadedAudioDrv->szDriver)
+            selectDriver(hDlg, loadedAudioDrv->szDriver);
     }
     else /* make a local copy of the current registry setting */
         strcpy(curAudioDriver, buf);