Changeset 1468

Timestamp:

03/08/10 05:33:58 (5 months ago)

Author:

dmitrykos

Message:

wasapi:

• improved debug log output: function name which returned error will be displayed as well
• fixed non-critical compiler warnings

File:

• portaudio/trunk/src/hostapi/wasapi/pa_win_wasapi.c (modified) (17 diffs)

portaudio/trunk/src/hostapi/wasapi/pa_win_wasapi.c

@@ -532 +532 @@
 
 // ------------------------------------------------------------------------------------------
-#define LogHostError(HRES) __LogHostError(HRES, __FILE__, __LINE__)
-static HRESULT __LogHostError(HRESULT res, const char *file, int line)
+#define LogHostError(HRES) __LogHostError(HRES, __FUNCTION__, __FILE__, __LINE__)
+static HRESULT __LogHostError(HRESULT res, const char *func, const char *file, int line)
 {
     const char *text = NULL;
@@ -575 +575 @@
                 text = "UNKNOWN ERROR";
     }
-        PRINT(("WASAPI ERROR HRESULT: 0x%X : %s\n [FILE: %s {LINE: %d}]\n",res, text, file, line));
+        PRINT(("WASAPI ERROR HRESULT: 0x%X : %s\n [FUNCTION: %s FILE: %s {LINE: %d}]\n", res, text, func, file, line));
         PA_SKELETON_SET_LAST_HOST_ERROR(res, text);
         return res;
@@ -581 +581 @@
 
 // ------------------------------------------------------------------------------------------
-#define LogPaError(PAERR) __LogPaError(PAERR, __FILE__, __LINE__)
-static PaError __LogPaError(PaError err, const char *file, int line)
+#define LogPaError(PAERR) __LogPaError(PAERR, __FUNCTION__, __FILE__, __LINE__)
+static PaError __LogPaError(PaError err, const char *func, const char *file, int line)
 {
         if (err == paNoError)
                 return err;
-        PRINT(("WASAPI ERROR PAERROR: %i : %s\n [FILE: %s {LINE: %d}]\n",err,Pa_GetErrorText(err),file,line));
+        PRINT(("WASAPI ERROR PAERROR: %i : %s\n [FUNCTION: %s FILE: %s {LINE: %d}]\n", err, Pa_GetErrorText(err), func, file, line));
         return err;
 }
@@ -1298 +1298 @@
     switch (old->wFormatTag)
         {
-    case WAVE_FORMAT_EXTENSIBLE:
-    {
+    case WAVE_FORMAT_EXTENSIBLE: {
         if (IsEqualGUID(&in->SubFormat, &pa_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT))
                 {
             if (in->Samples.wValidBitsPerSample == 32)
                 return paFloat32;
-            else
-                return paCustomFormat;
         }
         else
                 if (IsEqualGUID(&in->SubFormat, &pa_KSDATAFORMAT_SUBTYPE_PCM))
                 {
-            switch (old->wBitsPerSample){
-                case 32: return paInt32; break;
-                case 24: return paInt24;break;
-                case  8: return paUInt8;break;
-                case 16: return paInt16;break;
-                default: return paCustomFormat;break;
+            switch (old->wBitsPerSample)
+                        {
+                case 32: return paInt32;
+                case 24: return paInt24;
+                case  8: return paUInt8;
+                case 16: return paInt16;
             }
         }
-        else
-            return paCustomFormat;
-    }
-    break;
-
-    case WAVE_FORMAT_IEEE_FLOAT:
-        return paFloat32;
-    break;
-
-    case WAVE_FORMAT_PCM:
-    {
+                break; }
+    
+    case WAVE_FORMAT_IEEE_FLOAT: 
+                return paFloat32;
+
+    case WAVE_FORMAT_PCM: {
         switch (old->wBitsPerSample)
                 {
-            case 32: return paInt32; break;
-            case 24: return paInt24;break;
-            case  8: return paUInt8;break;
-            case 16: return paInt16;break;
-            default: return paCustomFormat;break;
+            case 32: return paInt32;
+            case 24: return paInt24;
+            case  8: return paUInt8;
+            case 16: return paInt16;
         }
-    }
-    break;
-
-    default:
-        return paCustomFormat;
-    break;
+                break; }
     }
 
@@ -1368 +1354 @@
 
     old                                  = (WAVEFORMATEX *)wavex;
-    old->nChannels       = params->channelCount;
+    old->nChannels       = (WORD)params->channelCount;
     old->nSamplesPerSec  = (DWORD)sampleRate;
         if ((old->wBitsPerSample = bitsPerSample) > 16)
@@ -1425 +1411 @@
 
     pwfext->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-    pwfext->Format.nChannels = channelCount;
-    pwfext->Format.nSamplesPerSec = (int)sampleRate;
+    pwfext->Format.nChannels = (WORD)channelCount;
+    pwfext->Format.nSamplesPerSec = (DWORD)sampleRate;
     if(channelCount == 1)
         pwfext->dwChannelMask = KSAUDIO_SPEAKER_DIRECTOUT;
@@ -1433 +1419 @@
     if(sampleFormat == paFloat32)
     {
-        pwfext->Format.nBlockAlign = channelCount * 4;
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 4);
         pwfext->Format.wBitsPerSample = 32;
         pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
@@ -1441 +1427 @@
     else if(sampleFormat == paInt32)
     {
-        pwfext->Format.nBlockAlign = channelCount * 4;
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 4);
         pwfext->Format.wBitsPerSample = 32;
         pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
@@ -1449 +1435 @@
     else if(sampleFormat == paInt24)
     {
-        pwfext->Format.nBlockAlign = channelCount * 4;
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 4);
         pwfext->Format.wBitsPerSample = 32; // 24-bit in 32-bit int container
         pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
@@ -1457 +1443 @@
     else if(sampleFormat == paInt16)
     {
-        pwfext->Format.nBlockAlign = channelCount * 2;
+        pwfext->Format.nBlockAlign = (WORD)(channelCount * 2);
         pwfext->Format.wBitsPerSample = 16;
         pwfext->Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE)-sizeof(WAVEFORMATEX);
@@ -1863 +1849 @@
         HRESULT hr;
     PaWasapiHostApiRepresentation *paWasapi = (PaWasapiHostApiRepresentation*)hostApi;
-    PaWasapiStream *stream;
+    PaWasapiStream *stream = NULL;
     int inputChannelCount, outputChannelCount;
     PaSampleFormat inputSampleFormat, outputSampleFormat;
@@ -2241 +2227 @@
 error:
 
-    if (stream)
+    if (stream != NULL)
         {
                 CloseStream(stream);
@@ -2290 +2276 @@
 static PaError StartStream( PaStream *s )
 {
-    PaError result = paNoError;
         HRESULT hr;
     PaWasapiStream *stream = (PaWasapiStream*)s;
@@ -2559 +2544 @@
         const BYTE *buffer = (BYTE *)_buffer;
         BYTE *data;
-        HRESULT hr;
+        HRESULT hr = S_OK;
         UINT32 next_rev_sleep, blocks, block_sleep_ms;
         UINT32 i;
@@ -2937 +2922 @@
 {
         HRESULT hr;
-        BYTE *data    = NULL;
-        DWORD flags   = 0;
+        BYTE *data = NULL;
 
         // Get buffer
@@ -3046 +3030 @@
         HRESULT hr;
         DWORD dwResult;
-        BOOL bInitOutput = FALSE;
     PaWasapiStream *stream = (PaWasapiStream *)param;
         PaWasapiHostProcessor defaultProcessor;
@@ -3169 +3152 @@
     PaWasapiHostProcessor processor[S_COUNT];
         HRESULT hr;
-        BOOL bInitOutput = FALSE;
     PaWasapiStream *stream = (PaWasapiStream *)param;
         PaWasapiHostProcessor defaultProcessor;