mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of driver_funcs.h

Browse Source
This commit is contained in:
twinaphex 2014-08-15 20:53:49 +02:00
parent 823be1ce41
commit d5de35935c
2 changed files with 18 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
driver.h
View File

@ -657,7 +657,24 @@ extern const struct softfilter_implementation *darken_get_implementation(softfil
extern const struct softfilter_implementation *scale2x_get_implementation(softfilter_simd_mask_t simd); extern const struct softfilter_implementation *scale2x_get_implementation(softfilter_simd_mask_t simd);
#endif #endif
#include "driver_funcs.h" static inline bool input_key_pressed_func(int key)
{
bool ret = false;
if (!driver.block_hotkey)
ret = ret || driver.input->key_pressed(driver.input_data, key);
#ifdef HAVE_OVERLAY
ret = ret || (driver.overlay_state.buttons & (1ULL << key));
#endif
#ifdef HAVE_COMMAND
if (driver.command)
ret = ret || rarch_cmd_get(driver.command, key);
#endif
return ret;
}
#ifdef __cplusplus #ifdef __cplusplus
} }

40
driver_funcs.h
View File

@ -1,40 +0,0 @@
/* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2014 - 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/>.
*/
// Convenience macros.
#ifndef _RARCH_DRIVER_FUNCS_H
#define _RARCH_DRIVER_FUNCS_H
static inline bool input_key_pressed_func(int key)
{
bool ret = false;
if (!driver.block_hotkey)
ret = ret || driver.input->key_pressed(driver.input_data, key);
#ifdef HAVE_OVERLAY
ret = ret || (driver.overlay_state.buttons & (1ULL << key));
#endif
#ifdef HAVE_COMMAND
if (driver.command)
ret = ret || rarch_cmd_get(driver.command, key);
#endif
return ret;
}
#endif /* _RARCH_DRIVER_FUNCS_H */