From 02f3d3565602146bbbfce85b2719246f24036cb9 Mon Sep 17 00:00:00 2001
From: Andrew Opalach <andrew@akon.city>
Date: Tue, 9 Apr 2024 11:24:01 -0400
Subject: Massive restructure and many changes

- The server-side list concept is still a wip

Signed-off-by: Andrew Opalach <andrew@akon.city>
---
 src/render/queue_libplacebo.c    | 6 +++---
 src/render/queue_tiger.c         | 4 ++--
 src/render/renderer.h            | 4 ++--
 src/render/renderer_libplacebo.c | 4 ++--
 src/render/renderer_tiger.c      | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/render')

diff --git a/src/render/queue_libplacebo.c b/src/render/queue_libplacebo.c
index de9df44..6316fe2 100644
--- a/src/render/queue_libplacebo.c
+++ b/src/render/queue_libplacebo.c
@@ -1,6 +1,6 @@
 #include <al/lib.h>
 #include <al/log.h>
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
 #define PL_LIBAV_IMPLEMENTATION 1
 #include <libplacebo/utils/libav.h>
 #endif
@@ -84,7 +84,7 @@ static void queue_lp_push(struct camu_frame_queue *queue, struct camu_frame *fra
     });
 }
 
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
 static bool map_av_frame(pl_gpu gpu, pl_tex *tex, const struct pl_source_frame *src,
     struct pl_frame *out_frame)
 {
@@ -187,7 +187,7 @@ struct camu_frame_queue *camu_frame_queue_lp_create(void)
 {
     struct camu_frame_queue_lp *lq = al_alloc_object(struct camu_frame_queue_lp);
     lq->q.push = queue_lp_push;
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
     lq->q.push_av_frame = queue_lp_push_av_frame;
 #endif
     lq->q.flush = queue_lp_flush;
diff --git a/src/render/queue_tiger.c b/src/render/queue_tiger.c
index 575b826..0e76502 100644
--- a/src/render/queue_tiger.c
+++ b/src/render/queue_tiger.c
@@ -33,7 +33,7 @@ static void queue_tiger_push(struct camu_frame_queue *queue, struct camu_frame *
     upload_texture(tq, frame->width, frame->height, frame->data, 0);
 }
 
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
 static void queue_tiger_push_av_frame(struct camu_frame_queue *queue, AVFrame *frame, f64 pts)
 {
     struct camu_frame_queue_tiger *tq = (struct camu_frame_queue_tiger *)queue;
@@ -80,7 +80,7 @@ struct camu_frame_queue *camu_frame_queue_tiger_create(void)
 {
     struct camu_frame_queue_tiger *tq = al_alloc_object(struct camu_frame_queue_tiger);
     tq->q.push = queue_tiger_push;
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
     tq->q.push_av_frame = queue_tiger_push_av_frame;
 #endif
     tq->q.flush = queue_tiger_flush;
diff --git a/src/render/renderer.h b/src/render/renderer.h
index 64dc691..e60c3a5 100644
--- a/src/render/renderer.h
+++ b/src/render/renderer.h
@@ -2,7 +2,7 @@
 
 #include <al/types.h>
 #include <skh/window.h>
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
 #include <libavcodec/avcodec.h>
 #endif
 
@@ -34,7 +34,7 @@ struct camu_renderer {
     struct camu_frame_queue *(*create_queue)(struct camu_renderer *);
     void (*resize)(struct camu_renderer *, s32 *, s32 *);
     void (*render)(struct camu_renderer *, struct camu_screen *);
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
     s32 (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, s32 flags);
     void *opaque;
 #endif
diff --git a/src/render/renderer_libplacebo.c b/src/render/renderer_libplacebo.c
index 148574b..03f30a5 100644
--- a/src/render/renderer_libplacebo.c
+++ b/src/render/renderer_libplacebo.c
@@ -1,7 +1,7 @@
 #include <al/lib.h>
 #include <al/log.h>
 #include <aki/file.h>
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
 #include <libplacebo/utils/libav.h>
 #endif
 
@@ -159,7 +159,7 @@ static bool renderer_lp_create_renderer(struct camu_renderer *renderer, s32 *wid
     }
 #endif
 
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
     //lr->r.get_buffer2 = pl_get_buffer2;
     //lr->r.opaque = &lr->gpu;
 #endif
diff --git a/src/render/renderer_tiger.c b/src/render/renderer_tiger.c
index e4ae239..049a3b6 100644
--- a/src/render/renderer_tiger.c
+++ b/src/render/renderer_tiger.c
@@ -152,7 +152,7 @@ static bool renderer_tiger_create_renderer(struct camu_renderer *renderer, s32 *
     //glGenBuffers(1, &tr->texture_buffer);
 #endif
 
-#ifdef HAVE_FFMPEG
+#ifdef CAMU_HAVE_FFMPEG
     tr->r.get_buffer2 = NULL;
     tr->r.opaque = NULL;
 #endif
-- 
cgit v1.2.3-101-g0448