[WINEALSA] use real name for wave also

Robert Reif reif at earthlink.net
Thu Mar 17 13:07:52 CST 2005


Use real names for wave device also.
-------------- next part --------------
Index: dlls/winmm/winealsa/audio.c
===================================================================
RCS file: /home/wine/wine/dlls/winmm/winealsa/audio.c,v
retrieving revision 1.65
diff -p -u -r1.65 audio.c
--- dlls/winmm/winealsa/audio.c	17 Mar 2005 18:54:20 -0000	1.65
+++ dlls/winmm/winealsa/audio.c	17 Mar 2005 19:05:22 -0000
@@ -685,8 +685,6 @@ LONG ALSA_WaveInit(void)
     int err=0;
     WINE_WAVEOUT*	        wwo;
     WINE_WAVEIN*	        wwi;
-    static const WCHAR init_out[] = {'S','B','1','6',' ','W','a','v','e',' ','O','u','t',0};
-    static const WCHAR init_in [] = {'S','B','1','6',' ','W','a','v','e',' ','I','n',0};
 
     wwo = &WOutDev[0];
 
@@ -698,7 +696,6 @@ LONG ALSA_WaveInit(void)
 
     wwo->caps.wMid = 0x0002;
     wwo->caps.wPid = 0x0104;
-    strcpyW(wwo->caps.szPname, init_out);
     wwo->caps.vDriverVersion = 0x0100;
     wwo->caps.dwFormats = 0x00000000;
     wwo->caps.dwSupport = WAVECAPS_VOLUME;
@@ -734,6 +731,7 @@ LONG ALSA_WaveInit(void)
        snd_pcm_stream_name(snd_pcm_info_get_stream(info)),
        (snd_pcm_info_get_subclass(info) == SND_PCM_SUBCLASS_GENERIC_MIX ? "GENERIC MIX": "MULTI MIX"));
 
+    strcpyW(wwo->caps.szPname, snd_pcm_info_get_name(info));
     strcpy(wwo->ds_desc.szDesc, snd_pcm_info_get_name(info));
     EXIT_ON_ERROR( snd_pcm_hw_params_any(h, hw_params) , "pcm hw params" );
 #undef EXIT_ON_ERROR
@@ -812,7 +810,6 @@ LONG ALSA_WaveInit(void)
 
     wwi->caps.wMid = 0x0002;
     wwi->caps.wPid = 0x0104;
-    strcpyW(wwi->caps.szPname, init_in);
     wwi->caps.vDriverVersion = 0x0100;
     wwi->caps.dwFormats = 0x00000000;
     wwi->caps.dwSupport = WAVECAPS_VOLUME;
@@ -842,6 +839,7 @@ LONG ALSA_WaveInit(void)
        snd_pcm_stream_name(snd_pcm_info_get_stream(info)),
        (snd_pcm_info_get_subclass(info) == SND_PCM_SUBCLASS_GENERIC_MIX ? "GENERIC MIX": "MULTI MIX"));
 
+    strcpyW(wwi->caps.szPname, snd_pcm_info_get_name(info));
     strcpy(wwi->ds_desc.szDesc, snd_pcm_info_get_name(info));
     EXIT_ON_ERROR( snd_pcm_hw_params_any(h, hw_params) , "pcm hw params" );
 #undef EXIT_ON_ERROR


More information about the wine-patches mailing list