Changes in uspace/app/wavplay/dplay.c [33b8d024:b6e481b] in mainline

File:

• uspace/app/wavplay/dplay.c (modified) (7 diffs)

uspace/app/wavplay/dplay.c

@@ -148 +148 @@
         const size_t fragment_size = pb->buffer.size / DEFAULT_FRAGMENTS;
         printf("Registering event callback\n");
-        errno_t ret = audio_pcm_register_event_callback(pb->device,
+        int ret = audio_pcm_register_event_callback(pb->device,
             device_event_callback, pb);
         if (ret != EOK) {
@@ -282 +282 @@
 
                 if (!started) {
-                        errno_t ret = audio_pcm_start_playback(pb->device,
+                        int ret = audio_pcm_start_playback(pb->device,
                             pb->f.channels, pb->f.sampling_rate,
                             pb->f.sample_format);
@@ -309 +309 @@
                         async_usleep(real_delay);
                 /* update buffer position */
-                const errno_t ret = audio_pcm_get_buffer_pos(pb->device, &pos);
+                const int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
                         printf("Failed to update position indicator %s\n",
@@ -329 +329 @@
  * @param device The device.
  * @param file The file.
- * @return 0 on success, non-zero on failure.
+ * @return Error code.
  */
 int dplay(const char *device, const char *file)
 {
-        errno_t ret = EOK;
+        int ret = EOK;
         audio_pcm_sess_t *session = NULL;
         if (str_cmp(device, "default") == 0) {
@@ -345 +345 @@
         }
         printf("Playing on device: %s.\n", device);
-        sysarg_t val;
-        ret = audio_pcm_query_cap(session, AUDIO_CAP_PLAYBACK, &val);
-        if (ret != EOK || !val) {
+        if (audio_pcm_query_cap(session, AUDIO_CAP_PLAYBACK) <= 0) {
                 printf("Device %s does not support playback\n", device);
                 ret = ENOTSUP;
@@ -353 +351 @@
         }
 
-        char* info = NULL;
+        const char* info = NULL;
         ret = audio_pcm_get_info_str(session, &info);
         if (ret != EOK) {
@@ -388 +386 @@
                 goto cleanup;
         }
-        ret = audio_pcm_query_cap(pb.device, AUDIO_CAP_BUFFER_POS, &val);
-        if (ret == EOK && val) {
+        if (audio_pcm_query_cap(pb.device, AUDIO_CAP_BUFFER_POS) > 0) {
                 play(&pb);
         } else {
-                ret = audio_pcm_query_cap(pb.device, AUDIO_CAP_INTERRUPT, &val);
-                if (ret == EOK && val)
+                if (audio_pcm_query_cap(pb.device, AUDIO_CAP_INTERRUPT) > 0)
                         play_fragment(&pb);
                 else