Changeset 2488 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/pa_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/pa_dev.c (modified) (24 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/pa_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 <portaudio.h>
+
+#if PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO
+
 
 #define THIS_FILE       "pa_dev.c"
@@ -452 +454 @@
                          pa_get_dev_count(f)));
 
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    return err ? PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -471 +473 @@
     pj_pool_release(pool);
     
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    return err ? PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -693 +695 @@
         if (rec_id < 0) {
             /* No such device. */
-            return PJMEDIA_ENOSNDREC;
+            return PJMEDIA_EAUD_NODEFDEV;
         }
     }
@@ -700 +702 @@
     if (!paDevInfo) {
         /* Assumed it is "No such device" error. */
-        return PJMEDIA_ESNDINDEVID;
+        return PJMEDIA_EAUD_INVDEV;
     }
 
@@ -710 +712 @@
         sampleFormat = paInt32;
     else
-        return PJMEDIA_ESNDINSAMPLEFMT;
+        return PJMEDIA_EAUD_SAMPFORMAT;
     
     pool = pj_pool_create(pa->pf, "recstrm", 1024, 1024, NULL);
@@ -753 +755 @@
     if (err != paNoError) {
         pj_pool_release(pool);
-        return PJMEDIA_ERRNO_FROM_PORTAUDIO(err);
+        return PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err);
     }
 
@@ -798 +800 @@
         if (play_id < 0) {
             /* No such device. */
-            return PJMEDIA_ENOSNDPLAY;
+            return PJMEDIA_EAUD_NODEFDEV;
         }
     } 
@@ -805 +807 @@
     if (!paDevInfo) {
         /* Assumed it is "No such device" error. */
-        return PJMEDIA_ESNDINDEVID;
+        return PJMEDIA_EAUD_INVDEV;
     }
 
@@ -815 +817 @@
         sampleFormat = paInt32;
     else
-        return PJMEDIA_ESNDINSAMPLEFMT;
+        return PJMEDIA_EAUD_SAMPFORMAT;
     
     pool = pj_pool_create(pa->pf, "playstrm", 1024, 1024, NULL);
@@ -859 +861 @@
     if (err != paNoError) {
         pj_pool_release(pool);
-        return PJMEDIA_ERRNO_FROM_PORTAUDIO(err);
+        return PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err);
     }
 
@@ -910 +912 @@
         if (rec_id < 0) {
             /* No such device. */
-            return PJMEDIA_ENOSNDREC;
+            return PJMEDIA_EAUD_NODEFDEV;
         }
     }
@@ -917 +919 @@
     if (!paRecDevInfo) {
         /* Assumed it is "No such device" error. */
-        return PJMEDIA_ESNDINDEVID;
+        return PJMEDIA_EAUD_INVDEV;
     }
 
@@ -925 +927 @@
         if (play_id < 0) {
             /* No such device. */
-            return PJMEDIA_ENOSNDPLAY;
+            return PJMEDIA_EAUD_NODEFDEV;
         }
     } 
@@ -932 +934 @@
     if (!paPlayDevInfo) {
         /* Assumed it is "No such device" error. */
-        return PJMEDIA_ESNDINDEVID;
+        return PJMEDIA_EAUD_INVDEV;
     }
 
@@ -943 +945 @@
         sampleFormat = paInt32;
     else
-        return PJMEDIA_ESNDINSAMPLEFMT;
+        return PJMEDIA_EAUD_SAMPFORMAT;
     
     pool = pj_pool_create(pa->pf, "sndstream", 1024, 1024, NULL);
@@ -1034 +1036 @@
     if (err != paNoError) {
         pj_pool_release(pool);
-        return PJMEDIA_ERRNO_FROM_PORTAUDIO(err);
+        return PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err);
     }
 
@@ -1143 +1145 @@
         const PaStreamInfo *si = Pa_GetStreamInfo(strm->rec_strm);
         if (!si)
-            return PJ_EINVALIDOP;
+            return PJMEDIA_EAUD_SYSERR;
 
         *(unsigned*)pval = (unsigned)(si->inputLatency * 1000);
@@ -1150 +1152 @@
         const PaStreamInfo *si = Pa_GetStreamInfo(strm->play_strm);
         if (!si)
-            return PJ_EINVALIDOP;
+            return PJMEDIA_EAUD_SYSERR;
 
         *(unsigned*)pval = (unsigned)(si->outputLatency * 1000);
         return PJ_SUCCESS;
     } else {
-        return PJ_ENOTSUP;
+        return PJMEDIA_EAUD_INVCAP;
     }
 }
@@ -1170 +1172 @@
 
     /* Nothing is supported */
-    return PJ_ENOTSUP;
+    return PJMEDIA_EAUD_INVCAP;
 }
 
@@ -1193 +1195 @@
     PJ_LOG(5,(THIS_FILE, "Done, status=%d", err));
 
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    return err ? PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -1224 +1226 @@
     PJ_LOG(5,(THIS_FILE, "Done, status=%d", err));
 
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+    return err ? PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
 }
 
@@ -1255 +1257 @@
     pj_pool_release(stream->pool);
 
-    return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
-}
-
+    return err ? PJMEDIA_AUDIODEV_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS;
+}
+
+#endif  /* PJMEDIA_AUDIO_DEV_HAS_PORTAUDIO */
+