From 5dcdee5faaa44348797503ac819d668224d2958d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 6 Jan 2020 14:57:02 +0100 Subject: [PATCH] Get rid of null camera file and null location file - and buildfix --- Makefile.common | 2 -- camera/drivers/nullcamera.c | 60 ------------------------------- griffin/griffin.c | 4 --- location/drivers/nulllocation.c | 64 --------------------------------- retroarch.c | 21 ++++++++++- retroarch.h | 2 -- 6 files changed, 20 insertions(+), 133 deletions(-) delete mode 100644 camera/drivers/nullcamera.c delete mode 100644 location/drivers/nulllocation.c diff --git a/Makefile.common b/Makefile.common index b90b350cfa..965917a782 100644 --- a/Makefile.common +++ b/Makefile.common @@ -244,8 +244,6 @@ OBJ += \ $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \ $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/null_resampler.o \ $(LIBRETRO_COMM_DIR)/utils/md5.o \ - location/drivers/nulllocation.o \ - camera/drivers/nullcamera.o \ wifi/drivers/nullwifi.o \ gfx/drivers/nullgfx.o \ gfx/display_servers/dispserv_null.o \ diff --git a/camera/drivers/nullcamera.c b/camera/drivers/nullcamera.c deleted file mode 100644 index e20e933155..0000000000 --- a/camera/drivers/nullcamera.c +++ /dev/null @@ -1,60 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2012-2015 - Michael Lelli - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include "../../retroarch.h" - -static void *nullcamera_init(const char *device, uint64_t caps, - unsigned width, unsigned height) -{ - (void)device; - return (void*)-1; -} - -static void nullcamera_free(void *data) -{ - (void)data; -} - -static bool nullcamera_start(void *data) -{ - (void)data; - return true; -} - -static void nullcamera_stop(void *data) -{ - (void)data; -} - -static bool nullcamera_poll(void *data, - retro_camera_frame_raw_framebuffer_t frame_raw_cb, - retro_camera_frame_opengl_texture_t frame_gl_cb) -{ - (void)data; - (void)frame_raw_cb; - (void)frame_gl_cb; - - return true; -} - -camera_driver_t camera_null = { - nullcamera_init, - nullcamera_free, - nullcamera_start, - nullcamera_stop, - nullcamera_poll, - "null", -}; diff --git a/griffin/griffin.c b/griffin/griffin.c index a28503296e..65a4c43bde 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -798,8 +798,6 @@ CAMERA #include "../cores/libretro-video-processor/video_processor_v4l2.c" #endif -#include "../camera/drivers/nullcamera.c" - /*============================================================ LEDS ============================================================ */ @@ -819,8 +817,6 @@ LOCATION #include "../location/drivers/android.c" #endif -#include "../location/drivers/nulllocation.c" - /*============================================================ RSOUND ============================================================ */ diff --git a/location/drivers/nulllocation.c b/location/drivers/nulllocation.c deleted file mode 100644 index da9e45587c..0000000000 --- a/location/drivers/nulllocation.c +++ /dev/null @@ -1,64 +0,0 @@ -/* RetroArch - A frontend for libretro. - * Copyright (C) 2010-2014 - Hans-Kristian Arntzen - * Copyright (C) 2011-2017 - Daniel De Matteis - * - * RetroArch is free software: you can redistribute it and/or modify it under the terms - * of the GNU General Public License as published by the Free Software Found- - * ation, either version 3 of the License, or (at your option) any later version. - * - * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - * PURPOSE. See the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along with RetroArch. - * If not, see . - */ - -#include "../../retroarch.h" - -static void *null_location_init(void) -{ - return NULL; -} - -static void null_location_free(void *data) -{ - (void)data; -} - -static bool null_location_start(void *data) -{ - (void)data; - return true; -} - -static void null_location_stop(void *data) -{ - (void)data; -} - -static bool null_location_get_position(void *data, double *latitude, - double *longitude, double *horiz_accuracy, - double *vert_accuracy) -{ - *latitude = 0.0; - *longitude = 0.0; - *horiz_accuracy = 0.0; - *vert_accuracy = 0.0; - return true; -} - -static void null_location_set_interval(void *data, - unsigned interval_ms, unsigned interval_distance) -{ -} - -location_driver_t location_null = { - null_location_init, - null_location_free, - null_location_start, - null_location_stop, - null_location_get_position, - null_location_set_interval, - "null", -}; diff --git a/retroarch.c b/retroarch.c index 798036952a..eca53a3735 100644 --- a/retroarch.c +++ b/retroarch.c @@ -655,7 +655,6 @@ static input_device_driver_t *joypad_drivers[] = { &udev_joypad, #endif #if defined(__linux) && !defined(ANDROID) - &ui_companion_null, &linuxraw_joypad, #endif #ifdef HAVE_PARPORT @@ -716,6 +715,16 @@ static const wifi_driver_t *wifi_drivers[] = { NULL, }; +static location_driver_t location_null = { + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + "null", +}; + static const location_driver_t *location_drivers[] = { #ifdef ANDROID &location_android, @@ -743,6 +752,7 @@ static ui_companion_driver_t ui_companion_null = { "null", }; + static const ui_companion_driver_t *ui_companion_drivers[] = { #if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__) &ui_companion_win32, @@ -779,6 +789,15 @@ static midi_driver_t *midi_drivers[] = { &midi_null }; +static camera_driver_t camera_null = { + NULL, + NULL, + NULL, + NULL, + NULL, + "null", +}; + static const camera_driver_t *camera_drivers[] = { #ifdef HAVE_V4L2 &camera_v4l2, diff --git a/retroarch.h b/retroarch.h index 8560dec790..ab960ecb51 100644 --- a/retroarch.h +++ b/retroarch.h @@ -1958,7 +1958,6 @@ typedef struct location_driver extern location_driver_t location_corelocation; extern location_driver_t location_android; -extern location_driver_t location_null; /** * config_get_location_driver_options: @@ -1999,7 +1998,6 @@ extern camera_driver_t camera_v4l2; extern camera_driver_t camera_android; extern camera_driver_t camera_rwebcam; extern camera_driver_t camera_avfoundation; -extern camera_driver_t camera_null; /** * config_get_camera_driver_options: