From f232d4b047f9efaf49f682d92e091618c17d42bb Mon Sep 17 00:00:00 2001 From: Olivier Girondel Date: Sun, 2 Jan 2022 17:37:10 +0100 Subject: [PATCH 1/3] Prevent multiple definition of 'stretching_buffer' at link time. --- screen.c | 3 +++ utils.h | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/screen.c b/screen.c index b2042f2..2adbccc 100644 --- a/screen.c +++ b/screen.c @@ -14,6 +14,9 @@ #include "EffecTV.h" #include "utils.h" +/* Defined in image.c */ +extern RGB32 *stretching_buffer; + /* Main screen for displaying video image */ SDL_Surface *screen; SDL_Window *window; diff --git a/utils.h b/utils.h index d6ec083..5bff0db 100644 --- a/utils.h +++ b/utils.h @@ -34,8 +34,6 @@ void fastsrand(unsigned int); /* * image.c */ - -RGB32 *stretching_buffer; int image_init(void); void image_end(void); void image_stretching_buffer_clear(RGB32 color); From d8e765e0e91a04d9c15000d673c5b890d34bb4e2 Mon Sep 17 00:00:00 2001 From: Olivier Girondel Date: Sun, 2 Jan 2022 17:39:04 +0100 Subject: [PATCH 2/3] Add 'core'. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index ae542a1..cc05cee 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *~ effectv v4lutils/v4ltest +core From 18c241f4c56cc8ec203b43aac95b95b11f118c32 Mon Sep 17 00:00:00 2001 From: Olivier Girondel Date: Sun, 2 Jan 2022 17:40:18 +0100 Subject: [PATCH 3/3] screen_getaddress() already checks 'stretch' value. --- main.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/main.c b/main.c index 8a181f8..a8bdcf3 100644 --- a/main.c +++ b/main.c @@ -258,11 +258,7 @@ static int startTV(const char *startEffect) } else { if(screen_lock() == 0) { src = (RGB32 *)video_getaddress(); - if(stretch) { - dest = stretching_buffer; - } else { - dest = (RGB32 *)screen_getaddress(); - } + dest = (RGB32 *)screen_getaddress(); ret = currentEffect->draw(src, dest);