winealsa patch 2

Ove Kaaven ovek at transgaming.com
Sun Apr 18 06:47:47 CDT 2004


Log:
Added detection of 48kHz and 96kHz support. Fixed a thinko, and some
misleading indentation.

Index: audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v
retrieving revision 1.34
diff -u -r1.34 audio.c
--- audio.c	31 Mar 2004 20:05:45 -0000	1.34
+++ audio.c	18 Apr 2004 11:40:45 -0000
@@ -372,12 +372,12 @@
     } else if (err == -ESTRPIPE) {
         while ((err = snd_pcm_resume(wwo->p_handle)) == -EAGAIN)
             sleep(1);       /* wait until the suspend flag is released */
-            if (err < 0) {
-                err = snd_pcm_prepare(wwo->p_handle);
-                if (err < 0)
-                    ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err));
-            }
-            return 0;
+        if (err < 0) {
+            err = snd_pcm_prepare(wwo->p_handle);
+            if (err < 0)
+                ERR("recovery from suspend failed, prepare failed: %s\n", snd_strerror(err));
+        }
+        return 0;
     }
     return err;
 }
@@ -608,6 +608,8 @@
        X(11025,1);
        X(22050,2);
        X(44100,4);
+       X(48000,48);
+       X(96000,96);
 #undef X
     }
 
@@ -712,6 +714,8 @@
        X(11025,1);
        X(22050,2);
        X(44100,4);
+       X(48000,48);
+       X(96000,96);
 #undef X
     }
 
@@ -1392,7 +1396,7 @@
     if ( dwFlags & WAVE_DIRECTSOUND )
     	flags |= SND_PCM_ASYNC;
 
-    if ( (err = snd_pcm_open(&pcm, wwo->device, SND_PCM_STREAM_PLAYBACK, dwFlags)) < 0)
+    if ( (err = snd_pcm_open(&pcm, wwo->device, SND_PCM_STREAM_PLAYBACK, flags)) < 0)
     {
         ERR("Error open: %s\n", snd_strerror(err));
 	return MMSYSERR_NOTENABLED;





More information about the wine-patches mailing list