mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of null camera file and null location file - and buildfix

Browse Source
This commit is contained in:
twinaphex 2020-01-06 14:57:02 +01:00
parent 8386c06e07
commit 5dcdee5faa
6 changed files with 20 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -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 \

60
camera/drivers/nullcamera.c
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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",
};

4
griffin/griffin.c
View File

@ -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
============================================================ */

64
location/drivers/nulllocation.c
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
#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",
};

21
retroarch.c
View File

@ -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,

2
retroarch.h
View File

@ -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: