Changeset 5a6cc679 in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2018-01-31T02:21:24Z (7 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

a0a9cc2

Parents:

132ab5d1

Message:

Merge commit '50f19b7ee8e94570b5c63896736c4eb49cfa18db' into forwardport

Not all ints are converted to errno_t in xhci tree yet, however it compiles and works

File:

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

uspace/app/wavplay/dplay.c

@@ -148 +148 @@
         const size_t fragment_size = pb->buffer.size / DEFAULT_FRAGMENTS;
         printf("Registering event callback\n");
-        int ret = audio_pcm_register_event_callback(pb->device,
+        errno_t ret = audio_pcm_register_event_callback(pb->device,
             device_event_callback, pb);
         if (ret != EOK) {
@@ -282 +282 @@
 
                 if (!started) {
-                        int ret = audio_pcm_start_playback(pb->device,
+                        errno_t 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 int ret = audio_pcm_get_buffer_pos(pb->device, &pos);
+                const errno_t ret = audio_pcm_get_buffer_pos(pb->device, &pos);
                 if (ret != EOK) {
                         printf("Failed to update position indicator %s\n",
@@ -333 +333 @@
 int dplay(const char *device, const char *file)
 {
-        int ret = EOK;
+        errno_t ret = EOK;
         audio_pcm_sess_t *session = NULL;
         if (str_cmp(device, "default") == 0) {