Bring in line with dependency changes

Signed-off-by: Andrew Opalach <andrew@akon.city>

4 files changed, 19 insertions, 19 deletions

diff --git a/src/buffer/audio.c b/src/buffer/audio.c
index 2cedcc8..5a956ec 100644
--- a/src/buffer/audio.c
+++ b/src/buffer/audio.c
@@ -11,7 +11,7 @@
 
 #define BUFFER_SIZE 9.0
 #define BUFFER_MARK_MIN 4.3 // Must be a most half of the buffer size.
-#define BUFFER_MARK_BUFFERED 2.5
+#define BUFFER_MARK_BUFFERED 2.0
 
 #ifdef CAMU_AUDIO_BUFFER_FADE
 #define FADE_STEP(fmt) (1.75f / (fmt)->sample_rate)
@@ -316,7 +316,7 @@ size_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, size_t re
                 pts = -pts;
                 ret = camu_audio_format_sec_to_bytes(&buf->fmt.req, pts);
                 ret = MIN(ret, req);
-                al_log_info("audio_buffer", "Delaying audio by %fs (%zu bytes).", pts, ret);
+                al_log_info("audio_buffer", "Delaying audio by %fs.", pts);
                 al_memset(data, 0, ret);
                 data += ret;
                 req -= ret;
diff --git a/src/buffer/clock.c b/src/buffer/clock.c
index 624c534..cbf63d5 100644
--- a/src/buffer/clock.c
+++ b/src/buffer/clock.c
@@ -1,5 +1,5 @@
 #include <al/lib.h>
-#include <aki/thread.h>
+#include <nnwt/thread.h>
 
 #include "clock.h"
 
@@ -31,13 +31,13 @@ void camu_clock_seek(struct camu_clock *clock, f64 base, u64 target)
 {
     clock->base = base;
     clock->offset = 0.0;
-    f64 tick = aki_get_tick();
+    f64 tick = nn_get_tick();
     if (clock->paused_at == -1.0) {
         // We are safe to directly edit the tick here.
         if (target == 0) {
             al_atomic_store(f64)(&clock->tick, -1.0, AL_ATOMIC_RELAXED);
         } else {
-            tick = calc_tick_offset(tick, aki_get_timestamp(), target);
+            tick = calc_tick_offset(tick, nn_get_timestamp(), target);
             al_atomic_store(f64)(&clock->tick, tick, AL_ATOMIC_RELAXED);
         }
     } else {
@@ -54,9 +54,9 @@ void camu_clock_offset(struct camu_clock *clock, f64 amount)
 void camu_clock_pause(struct camu_clock *clock, u64 target)
 {
     al_assert(clock->paused_at == -1.0);
-    f64 tick = aki_get_tick();
+    f64 tick = nn_get_tick();
     if (target > 0) {
-        tick = calc_tick_offset(tick, aki_get_timestamp(), target);
+        tick = calc_tick_offset(tick, nn_get_timestamp(), target);
         al_atomic_store(f64)(&clock->pause, tick, AL_ATOMIC_RELAXED);
     } else {
         al_atomic_store(f64)(&clock->pause, PAUSED, AL_ATOMIC_RELAXED);
@@ -67,12 +67,12 @@ void camu_clock_pause(struct camu_clock *clock, u64 target)
 void camu_clock_resume(struct camu_clock *clock, u64 target)
 {
     al_assert(clock->paused_at != -1.0);
-    f64 tick = aki_get_tick();
+    f64 tick = nn_get_tick();
     //if (pause != PAUSED && tick < pause) {
     //    tick = pause;
     //} else if (target > 0) {
     if (target > 0) {
-        tick = calc_tick_offset(tick, aki_get_timestamp(), target);
+        tick = calc_tick_offset(tick, nn_get_timestamp(), target);
     }
     if (clock->paused_at == 0.0) {
         if (target == 0) {
@@ -107,7 +107,7 @@ f64 camu_clock_get_pts(struct camu_clock *clock, f64 offset)
 {
     f64 pause = al_atomic_load(f64)(&clock->pause, AL_ATOMIC_ACQUIRE);
     if (pause == PAUSED) return -1.0;
-    f64 current = aki_get_tick();
+    f64 current = nn_get_tick();
     f64 tick = al_atomic_load(f64)(&clock->tick, AL_ATOMIC_RELAXED);
     if (tick == -1.0) {
         tick = al_atomic_compare_and_swap(f64)(&clock->tick, -1.0, current);
diff --git a/src/buffer/peak_buffer.c b/src/buffer/peak_buffer.c
index 005e77f..eec031a 100644
--- a/src/buffer/peak_buffer.c
+++ b/src/buffer/peak_buffer.c
@@ -4,27 +4,27 @@
 
 void camu_peak_buffer_init(struct camu_peak_buffer *buf, size_t size)
 {
-    aki_buffer_init(&buf->buf);
-    aki_buffer_ensure_space(&buf->buf, size);
+    nn_buffer_init(&buf->buf);
+    nn_buffer_ensure_space(&buf->buf, size);
 }
 
 void camu_peak_buffer_push(struct camu_peak_buffer *buf, u8 *data, size_t size)
 {
-    aki_buffer_append(&buf->buf, data, size);
+    nn_buffer_append(&buf->buf, data, size);
 }
 
 size_t camu_peak_buffer_size(struct camu_peak_buffer *buf)
 {
-    return aki_buffer_get_size(&buf->buf);
+    return nn_buffer_get_size(&buf->buf);
 }
 
 u8 *camu_peak_buffer_flush(struct camu_peak_buffer *buf)
 {
-    aki_buffer_set_size(&buf->buf, 0);
-    return aki_buffer_get_ptr(&buf->buf, 0);
+    nn_buffer_set_size(&buf->buf, 0);
+    return nn_buffer_get_ptr(&buf->buf, 0);
 }
 
 void camu_peak_buffer_free(struct camu_peak_buffer *buf)
 {
-    aki_buffer_free(&buf->buf);
+    nn_buffer_free(&buf->buf);
 }
diff --git a/src/buffer/peak_buffer.h b/src/buffer/peak_buffer.h
index c518ade..ebb9939 100644
--- a/src/buffer/peak_buffer.h
+++ b/src/buffer/peak_buffer.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <al/types.h>
-#include <aki/common.h>
+#include <nnwt/common.h>
 
 struct camu_peak_buffer {
-    struct aki_buffer buf;
+    struct nn_buffer buf;
 };
 
 void camu_peak_buffer_init(struct camu_peak_buffer *buf, size_t size);