Changeset 132ab5d1 in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

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

uspace/app/wavplay/dplay.c

@@ -329 +329 @@
  * @param device The device.
  * @param file The file.
- * @return Error code.
+ * @return 0 on success, non-zero on failure.
  */
 int dplay(const char *device, const char *file)
@@ -345 +345 @@
         }
         printf("Playing on device: %s.\n", device);
-        if (audio_pcm_query_cap(session, AUDIO_CAP_PLAYBACK) <= 0) {
+        sysarg_t val;
+        ret = audio_pcm_query_cap(session, AUDIO_CAP_PLAYBACK, &val);
+        if (ret != EOK || !val) {
                 printf("Device %s does not support playback\n", device);
                 ret = ENOTSUP;
@@ -386 +388 @@
                 goto cleanup;
         }
-        if (audio_pcm_query_cap(pb.device, AUDIO_CAP_BUFFER_POS) > 0) {
+        ret = audio_pcm_query_cap(pb.device, AUDIO_CAP_BUFFER_POS, &val);
+        if (ret == EOK && val) {
                 play(&pb);
         } else {
-                if (audio_pcm_query_cap(pb.device, AUDIO_CAP_INTERRUPT) > 0)
+                ret = audio_pcm_query_cap(pb.device, AUDIO_CAP_INTERRUPT, &val);
+                if (ret == EOK && val)
                         play_fragment(&pb);
                 else