Changes in uspace/app/wavplay/dplay.c [205f1add:5f97ef44] in mainline

File:

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

uspace/app/wavplay/dplay.c

@@ -42 +42 @@
 #include <pcm/format.h>
 #include <as.h>
-#include <time.h>
+#include <sys/time.h>
 #include <inttypes.h>
 #include <stdbool.h>
@@ -242 +242 @@
 
 #define DPRINTF(f, ...) \
-        printf("%.2lld:%.6lld   "f, time.tv_sec % 100, \
-            NSEC2USEC(time.tv_nsec), __VA_ARGS__)
+        printf("%.2lu:%.6lu   "f, time.tv_sec % 100, time.tv_usec, __VA_ARGS__)
 
 /**
@@ -256 +255 @@
         printf("Playing: %dHz, %s, %d channel(s).\n", pb->f.sampling_rate,
             pcm_sample_format_str(pb->f.sample_format), pb->f.channels);
-        usec_t work_time = 50000; /* 50 ms */
+        useconds_t work_time = 50000; /* 50 ms */
         bool started = false;
         size_t pos = 0;
-        struct timespec time = { 0 };
+        struct timeval time = { 0 };
         getuptime(&time);
         while (true) {
@@ -304 +303 @@
                 }
                 const size_t to_play = buffer_occupied(pb, pos);
-                const usec_t usecs = pcm_format_size_to_usec(to_play, &pb->f);
+                const useconds_t usecs =
+                    pcm_format_size_to_usec(to_play, &pb->f);
 
                 /* Compute delay time */
-                const usec_t real_delay = (usecs > work_time) ?
+                const useconds_t real_delay = (usecs > work_time) ?
                     usecs - work_time : 0;
-                DPRINTF("POS %zu: %lld usecs (%lld) to play %zu bytes.\n",
+                DPRINTF("POS %zu: %u usecs (%u) to play %zu bytes.\n",
                     pos, usecs, real_delay, to_play);
                 if (real_delay)