Changes in uspace/app/wavplay/drec.c [33b8d024:0e4c5f0] in mainline

File:

• uspace/app/wavplay/drec.c (modified) (6 diffs)

uspace/app/wavplay/drec.c

@@ -42 +42 @@
 #include <as.h>
 #include <inttypes.h>
-#include <str.h>
 
 #include "wave.h"
@@ -140 +139 @@
         assert(rec);
         assert(rec->device);
-        errno_t ret = audio_pcm_register_event_callback(rec->device,
+        int ret = audio_pcm_register_event_callback(rec->device,
             device_event_callback, rec);
         if (ret != EOK) {
@@ -171 +170 @@
  * @param device The device.
  * @param file The file.
- * @return 0 on succes, non-zero on failure.
+ * @return Error code.
  */
 int drecord(const char *device, const char *file)
 {
-        errno_t ret = EOK;
+        int ret = EOK;
         audio_pcm_sess_t *session = NULL;
-        sysarg_t val;
         if (str_cmp(device, "default") == 0) {
                 session = audio_pcm_open_default();
@@ -188 +186 @@
         }
         printf("Recording on device: %s.\n", device);
-        ret = audio_pcm_query_cap(session, AUDIO_CAP_CAPTURE, &val);
-        if (ret != EOK || !val) {
+        if (audio_pcm_query_cap(session, AUDIO_CAP_CAPTURE) <= 0) {
                 printf("Device %s does not support recording\n", device);
                 ret = ENOTSUP;
@@ -195 +192 @@
         }
 
-        char* info = NULL;
+        const char* info = NULL;
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
@@ -228 +225 @@
                 goto cleanup;
         }
-        ret = audio_pcm_query_cap(rec.device, AUDIO_CAP_INTERRUPT, &val);
-        if (ret == EOK && val)
+        if (audio_pcm_query_cap(rec.device, AUDIO_CAP_INTERRUPT) > 0)
                 record_fragment(&rec, format);
         else