[PATCH] wineoss: Silence some harmless warnings

Maarten Lankhorst maarten at codeweavers.com
Mon Sep 24 13:33:50 CDT 2007


---
 dlls/wineoss.drv/audio.c    |    6 ++----
 dlls/wineoss.drv/dsrender.c |    6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c
index f3360cf..332280b 100644
--- a/dlls/wineoss.drv/audio.c
+++ b/dlls/wineoss.drv/audio.c
@@ -2082,10 +2082,8 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
 
     /* Check that fragsize is correct per our settings above */
     if ((info.fragsize > 1024) && (LOWORD(audio_fragment) <= 10)) {
-	/* we've tried to set 1K fragments or less, but it didn't work */
-	ERR("fragment size set failed, size is now %d\n", info.fragsize);
-	MESSAGE("Your Open Sound System driver did not let us configure small enough sound fragments.\n");
-	MESSAGE("This may cause delays and other problems in audio playback with certain applications.\n");
+        /* we've tried to set 1K fragments or less, but it didn't work */
+        WARN("fragment size set failed, size is now %d\n", info.fragsize);
     }
 
     /* Remember fragsize and total buffer size for future use */
diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c
index 27672fb..3236456 100644
--- a/dlls/wineoss.drv/dsrender.c
+++ b/dlls/wineoss.drv/dsrender.c
@@ -940,10 +940,8 @@ DWORD wodDsCreate(UINT wDevID, PIDSDRIVER* drv)
 
     /* the HAL isn't much better than the HEL if we can't do mmap() */
     if (!(WOutDev[wDevID].ossdev->duplex_out_caps.dwSupport & WAVECAPS_DIRECTSOUND)) {
-	ERR("DirectSound flag not set\n");
-	MESSAGE("This sound card's driver does not support direct access\n");
-	MESSAGE("The (slower) DirectSound HEL mode will be used instead.\n");
-	return MMSYSERR_NOTSUPPORTED;
+        WARN("Warn DirectSound flag not set, falling back to HEL layer\n");
+        return MMSYSERR_NOTSUPPORTED;
     }
 
     *idrv = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(IDsDriverImpl));
-- 
1.5.2.5


--------------050303020206060703080408--



More information about the wine-patches mailing list