Sink fixes, update for dependency changes

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

5 files changed, 13 insertions, 13 deletions

diff --git a/src/buffer/audio.c b/src/buffer/audio.c
index 5058154..ac698bb 100644
--- a/src/buffer/audio.c
+++ b/src/buffer/audio.c
@@ -310,7 +310,7 @@ size_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, size_t re
         if (UNLIKELY(!buf->ignore_desync && buf->pause == PAUSE_PAUSED)) {
             if (pts > 0.0) { // Skip.
                 ret = camu_audio_format_sec_to_bytes(&buf->fmt.req, pts);
-                ret = AL_MIN(ret, have);
+                ret = MIN(ret, have);
                 al_log_info("audio_buffer", "Skipping %fs of audio (%zu bytes).", pts, ret);
                 ret = al_ring_buffer_discard(&buf->rb, ret);
                 have -= ret;
@@ -319,7 +319,7 @@ size_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, size_t re
             } else if (pts < 0.0) { // Delay.
                 pts = -pts;
                 ret = camu_audio_format_sec_to_bytes(&buf->fmt.req, pts);
-                ret = AL_MIN(ret, req);
+                ret = MIN(ret, req);
                 al_log_info("audio_buffer", "Delaying audio by %fs (%zu bytes).", pts, ret);
                 al_memset(data, 0, ret);
                 data += ret;
@@ -369,7 +369,7 @@ size_t camu_audio_buffer_read(struct camu_audio_buffer *buf, u8 *data, size_t re
             // If flow = SIGNALED, we are waiting to be removed or reset.
         }
         // The amount of available data could've increased in the flow = FLUSHED case.
-        req = AL_MIN(req, have);
+        req = MIN(req, have);
     }
 
     if (req > 0) {
diff --git a/src/buffer/frame_queue.h b/src/buffer/frame_queue.h
index f670ded..e3044f1 100644
--- a/src/buffer/frame_queue.h
+++ b/src/buffer/frame_queue.h
@@ -19,7 +19,7 @@ struct camu_frame_queue {
     void (*push)(struct camu_frame_queue *, struct camu_codec_frame *, f64);
 #ifdef CAMU_HAVE_FFMPEG
     void (*push_av_frame)(struct camu_frame_queue *, AVFrame *, f64);
-    void (*configure_subtitles)(struct camu_frame_queue *, s32, s32, AVCodecParameters *);
+    bool (*configure_subtitles)(struct camu_frame_queue *, s32, s32, AVCodecParameters *);
     void (*push_subtitle)(struct camu_frame_queue *, AVPacket *);
 #endif
     void (*flush)(struct camu_frame_queue *);
diff --git a/src/buffer/video.c b/src/buffer/video.c
index b528141..30e19c7 100644
--- a/src/buffer/video.c
+++ b/src/buffer/video.c
@@ -187,10 +187,10 @@ void camu_video_buffer_push(struct camu_video_buffer *buf, struct camu_codec_fra
 }
 
 #ifdef CAMU_HAVE_FFMPEG
-void camu_video_buffer_configure_subtitles(struct camu_video_buffer *buf, AVCodecParameters *codecpar)
+bool camu_video_buffer_configure_subtitles(struct camu_video_buffer *buf, AVCodecParameters *codecpar)
 {
     struct camu_video_format *fmt = &buf->stream->video.fmt;
-    buf->queue->configure_subtitles(buf->queue, fmt->width, fmt->height, codecpar);
+    return buf->queue->configure_subtitles(buf->queue, fmt->width, fmt->height, codecpar);
 }
 
 void camu_video_buffer_push_subtitle(struct camu_video_buffer *buf, AVPacket *pkt)
diff --git a/src/buffer/video.h b/src/buffer/video.h
index fd7ec9f..3953fc1 100644
--- a/src/buffer/video.h
+++ b/src/buffer/video.h
@@ -48,7 +48,7 @@ void camu_video_buffer_set_latency(struct camu_video_buffer *buf, s32 frames);
 bool camu_video_buffer_is_single_frame(struct camu_video_buffer *buf);
 void camu_video_buffer_push(struct camu_video_buffer *buf, struct camu_codec_frame *frame);
 #ifdef CAMU_HAVE_FFMPEG
-void camu_video_buffer_configure_subtitles(struct camu_video_buffer *buf, AVCodecParameters *codecpar);
+bool camu_video_buffer_configure_subtitles(struct camu_video_buffer *buf, AVCodecParameters *codecpar);
 void camu_video_buffer_push_subtitle(struct camu_video_buffer *buf, AVPacket *pkt);
 #endif
 void camu_video_buffer_flush(struct camu_video_buffer *buf);
diff --git a/src/buffer/volume.h b/src/buffer/volume.h
index d39affc..6a8cf0a 100644
--- a/src/buffer/volume.h
+++ b/src/buffer/volume.h
@@ -6,11 +6,11 @@ static inline f32 apply_volume_f32(f32 *data, size_t sample_count, s32 channel_c
 {
     for (u32 i = 0; i < sample_count; i++) {
         if (step != 0.f && i % channel_count == 0) {
-            volume = AL_CLAMP(volume + step, 0.f, user);
+            volume = CLAMP(volume + step, 0.f, user);
         }
         f64 sample = (f64)data[i];
         sample *= volume;
-        data[i] = (f32)AL_CLAMP(sample, -1.0, 1.0);
+        data[i] = (f32)CLAMP(sample, -1.0, 1.0);
     }
     return volume;
 }
@@ -19,11 +19,11 @@ static inline f32 apply_volume_s32(s32 *data, size_t sample_count, s32 channel_c
 {
     for (u32 i = 0; i < sample_count; i++) {
         if (step != 0.f && i % channel_count == 0) {
-            volume = AL_CLAMP(volume + step, 0.f, user);
+            volume = CLAMP(volume + step, 0.f, user);
         }
         f64 sample = (f64)data[i];
         sample *= volume;
-        data[i] = (s32)AL_CLAMP(sample, INT32_MIN, INT32_MAX);
+        data[i] = (s32)CLAMP(sample, (f64)INT32_MIN, (f64)INT32_MAX);
     }
     return volume;
 }
@@ -32,11 +32,11 @@ static inline f32 apply_volume_s16(s16 *data, size_t sample_count, s32 channel_c
 {
     for (u32 i = 0; i < sample_count; i++) {
         if (step != 0.f && i % channel_count == 0) {
-            volume = AL_CLAMP(volume + step, 0.f, user);
+            volume = CLAMP(volume + step, 0.f, user);
         }
         f64 sample = (f64)data[i];
         sample *= volume;
-        data[i] = (s16)AL_CLAMP(sample, INT16_MIN, INT16_MAX);
+        data[i] = (s16)CLAMP(sample, (f64)INT16_MIN, (f64)INT16_MAX);
     }
     return volume;
 }