Changeset 2488 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/wmme_dev.c

Timestamp:

Mar 4, 2009 7:00:28 PM (14 years ago)

Author:

bennylp

Message:

Ticket #734: error codes in audiodev

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/wmme_dev.c (modified) (17 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/wmme_dev.c

@@ -19 +19 @@
  */
 #include <pjmedia-audiodev/audiodev_imp.h>
-#include <pjmedia/errno.h>
 #include <pj/assert.h>
 #include <pj/log.h>
@@ -25 +24 @@
 #include <pj/string.h>
 #include <pj/unicode.h>
+
+#if PJMEDIA_AUDIO_DEV_HAS_WMME
+
 #ifdef _MSC_VER
 #   pragma warning(push, 3)
@@ -168 +170 @@
 };
 
-/* Utility: convert MMERROR to pj_status_t */
-PJ_INLINE(pj_status_t) CONVERT_MM_ERROR(MMRESULT mr)
-{
-    return PJ_RETURN_OS_ERROR(mr);
-}
-
 
 /****************************************************************************
@@ -548 +544 @@
                      &wfx, (DWORD)wmme_strm->hEvent, 0, CALLBACK_EVENT);
     if (mr != MMSYSERR_NOERROR) {
-        return CONVERT_MM_ERROR(mr);
+        return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
     }
 
@@ -554 +550 @@
     mr = waveOutPause(wmme_strm->hWave.Out);
     if (mr != MMSYSERR_NOERROR) {
-        return CONVERT_MM_ERROR(mr);
+        return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
     }
 
@@ -570 +566 @@
                                   sizeof(WAVEHDR));
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr); 
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr); 
         }
         mr = waveOutWrite(wmme_strm->hWave.Out, &(wmme_strm->WaveHdr[i]), 
                           sizeof(WAVEHDR));
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
         }
     }
@@ -634 +630 @@
                     &wfx, (DWORD)wmme_strm->hEvent, 0, CALLBACK_EVENT);
     if (mr != MMSYSERR_NOERROR) {
-        return CONVERT_MM_ERROR(mr);
+        return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
     }
 
@@ -650 +646 @@
                                  sizeof(WAVEHDR));
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
         }
         mr = waveInAddBuffer(wmme_strm->hWave.In, &(wmme_strm->WaveHdr[i]), 
                              sizeof(WAVEHDR));
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
         }
     }
@@ -831 +827 @@
                                   sizeof(WAVEHDR));
                 if (mr != MMSYSERR_NOERROR) {
-                    status = CONVERT_MM_ERROR(mr);
+                    status = PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
                     break;
                 }
@@ -928 +924 @@
                                      sizeof(WAVEHDR));
                 if (mr != MMSYSERR_NOERROR) {
-                    status = CONVERT_MM_ERROR(mr);
+                    status = PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
                     break;
                 }
@@ -1147 +1143 @@
         mr = waveOutGetVolume(strm->play_strm.hWave.Out, &dwVol);
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
         }
 
@@ -1178 +1174 @@
 
         mr = waveOutSetVolume(strm->play_strm.hWave.Out, dwVol);
-        return (mr==MMSYSERR_NOERROR)? PJ_SUCCESS : CONVERT_MM_ERROR(mr);
+        return (mr==MMSYSERR_NOERROR)? PJ_SUCCESS : 
+                                PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
     } else {
         return PJ_ENOTSUP;
@@ -1196 +1193 @@
         mr = waveOutRestart(stream->play_strm.hWave.Out);
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
         }
         PJ_LOG(4,(THIS_FILE, "WMME playback stream started"));
@@ -1205 +1202 @@
         mr = waveInStart(stream->rec_strm.hWave.In);
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
         }
         PJ_LOG(4,(THIS_FILE, "WMME capture stream started"));
@@ -1225 +1222 @@
         mr = waveOutPause(stream->play_strm.hWave.Out);
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_OUT(mr);
         }
         PJ_LOG(4,(THIS_FILE, "Stopped WMME playback stream"));
@@ -1234 +1231 @@
         mr = waveInStop(stream->rec_strm.hWave.In);
         if (mr != MMSYSERR_NOERROR) {
-            return CONVERT_MM_ERROR(mr);
+            return PJMEDIA_AUDIODEV_ERRNO_FROM_WMME_IN(mr);
         }
         PJ_LOG(4,(THIS_FILE, "Stopped WMME capture stream"));
@@ -1304 +1301 @@
 }
 
+#endif  /* PJMEDIA_AUDIO_DEV_HAS_WMME */
+