Changeset 253

Timestamp:

Sep 19, 2007, 8:05:49 AM (18 years ago)

Author:

Brendan Oakley

Message:

Clean up more compile warnings in uniaud16

Location:

OCO/trunk/drv16

Files:

• strategy.cpp (modified) (4 diffs)
• waveplay.cpp (modified) (2 diffs)

OCO/trunk/drv16/strategy.cpp

@@ -82 +82 @@
 extern "C" char szAZX[];
 
+#ifdef ENABLE_HW_CERTIFICATION
 static char *pszIntelICH        = (char *)szINTEL_ICH;
 #if 0 // fixme to be gone
@@ -112 +113 @@
 static char *pszBT87X           = (char *)szBT87X;
 static char *pszAZX             = (char *)szAZX;
+#endif /* ENABLE_HW_CERTIFICATION */
 
        BOOL fNoHardware         = FALSE;
@@ -186 +188 @@
    }
 
-   /* skip sertifying crap */
-
-   return TRUE;
+#ifdef ENABLE_HW_CERTIFICATION
+
    //Check for certified audiocard/chipsets
    if(!xorstrncmp(devCaps[0].szDeviceName, pszIntelICH, 6) ||
@@ -311 +312 @@
        goto failure;
    }
+#endif /* ENABLE_HW_CERTIFICATION */
    return TRUE;
 

OCO/trunk/drv16/waveplay.cpp

@@ -127 +127 @@
 #endif // fixme to be gone?
     {
-        //if(devCaps[ulDeviceNr].waveOutCaps.nrStreams > 1)
-        if (0)
+
+/* Setting DISABLE_STREAM_REUSE will close the open stream here.      */
+/* If left unset, the idea is the open stream will be reused instead. */
+/* FIXME: Does it make sense that a Close function does not close     */
+/* anything?                                                          */
+#ifdef DISABLE_STREAM_REUSE
+        if(devCaps[ulDeviceNr].waveOutCaps.nrStreams > 1)
         {
             if (OSS16_WaveClose(StreamIdl) == OSSERR_SUCCESS)
@@ -139 +144 @@
                 return FALSE;
         }
-        //else don't close stream; reuse it instead
+        else
+#else /* !DISABLE_STREAM_REUSE */
+        if (StreamIdl == NULL)
+                return FALSE;
+#endif /* DISABLE_STREAM_REUSE */
         return TRUE;
     }