wodOpen() should return MMSYSERR_ALLOCATED if the device is already

allocated. Allow for multiple audio devices. Fix wodPlayer_reset as with aRts we cannot cancel audio data already written to the server. Rename some functions. Cleanup unused code.

wodOpen() should return MMSYSERR_ALLOCATED if the device is already
cf5bfc44 · Chris Morgan · Alexandre Julliard · ace56c62 · cf5bfc44 · cf5bfc44
Commit cf5bfc44 authored Mar 25, 2002 by Chris Morgan Committed by Alexandre Julliard Mar 25, 2002
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 94 additions and 109 deletions

arts.c dlls/winmm/winearts/arts.c +1 -1

arts.h dlls/winmm/winearts/arts.h +1 -1

audio.c dlls/winmm/winearts/audio.c +92 -107

No files found.
--- a/dlls/winmm/winearts/arts.c
+++ b/dlls/winmm/winearts/arts.c
@@ -75,7 +75,7 @@ LONG CALLBACK	ARTS_DriverProc(DWORD dwDevID, HDRVR hDriv, DWORD wMsg,
 /*    				ARTS_MidiInit(); FIXME: no midi 
 support in artsc so we don't have any in the arts driver */
 				return 1;
-    case DRV_FREE:	        return ARTS_CloseDevice();
+    case DRV_FREE:	        return ARTS_WaveClose();
    case DRV_OPEN:		return ARTS_drvOpen((LPSTR)dwParam1);
    case DRV_CLOSE:		return ARTS_drvClose(dwDevID);
    case DRV_ENABLE:		return 1;

--- a/dlls/winmm/winearts/arts.h
+++ b/dlls/winmm/winearts/arts.h
@@ -29,6 +29,6 @@
 #endif

 extern LONG ARTS_WaveInit(void);
-extern LONG ARTS_CloseDevice(void);
+extern LONG ARTS_WaveClose(void);

 #endif  /* __WINE_ARTS_H */
--- a/dlls/winmm/winearts/audio.c
+++ b/dlls/winmm/winearts/audio.c