Changeset 205f1add in mainline for uspace/app/wavplay/dplay.c

Timestamp:

2018-08-23T21:14:56Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Children:

f33c989e

Parents:

e2625b1a

git-author:

Jakub Jermar <jakub@…> (2018-08-21 21:58:52)

git-committer:

Jakub Jermar <jakub@…> (2018-08-23 21:14:56)

Message:

Get rid of sys/time.h

This commit moves the POSIX-like time functionality from libc's
sys/time.h to libposix and introduces C99-like or HelenOS-specific
interfaces to libc.

Specifically, use of sys/time.h, struct timeval, suseconds_t and
gettimeofday is replaced by time.h (C99), struct timespec (C99),
usec_t (HelenOS) and getuptime / getrealtime (HelenOS).

File:

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

uspace/app/wavplay/dplay.c

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