Changeset bc73be3 in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

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

uspace/app/wavplay/dplay.c

@@ -103 +103 @@
                 async_get_call(&call);
 
-                switch (IPC_GET_IMETHOD(call)) {
+                switch (ipc_get_imethod(&call)) {
                 case PCM_EVENT_PLAYBACK_STARTED:
                 case PCM_EVENT_FRAMES_PLAYED:
-                        printf("%" PRIun " frames: ", IPC_GET_ARG1(call));
+                        printf("%" PRIun " frames: ", ipc_get_arg1(&call));
                         async_answer_0(&call, EOK);
                         break;
@@ -118 +118 @@
                         return;
                 default:
-                        printf("Unknown event %" PRIun ".\n", IPC_GET_IMETHOD(call));
+                        printf("Unknown event %" PRIun ".\n", ipc_get_imethod(&call));
                         async_answer_0(&call, ENOTSUP);
                         continue;