libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-13 05:10:42 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(input_overlay.c) Turn more functions static

Browse Source
This commit is contained in:
twinaphex 2015-07-12 07:32:51 +02:00
parent a0b2e4881a
commit b3e054a946
2 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
input/input_overlay.c
View File

@ -297,9 +297,10 @@ static void input_overlay_free_overlay(struct overlay *overlay)
texture_image_free(&overlay->image); texture_image_free(&overlay->image);
} }
static void input_overlay_free_overlays(input_overlay_t *ol) static void input_overlay_free_overlays(void)
{ {
size_t i; size_t i;
input_overlay_t *ol = input_overlay_get_ptr();
if (!ol) if (!ol)
return; return;
@ -636,6 +637,23 @@ static void input_overlay_load_active(float opacity)
ol->iface->full_screen(ol->iface_data, ol->active->full_screen); ol->iface->full_screen(ol->iface_data, ol->active->full_screen);
} }
/**
* input_overlay_enable:
* @enable : Enable or disable the overlay
*
* Enable or disable the overlay.
**/
static void input_overlay_enable(bool enable)
{
input_overlay_t *ol = input_overlay_get_ptr();
if (!ol)
return;
ol->enable = enable;
if (ol->iface && ol->iface->enable)
ol->iface->enable(ol->iface_data, enable);
}
bool input_overlay_load_overlays_resolve_iterate(void) bool input_overlay_load_overlays_resolve_iterate(void)
{ {
input_overlay_t *ol = input_overlay_get_ptr(); input_overlay_t *ol = input_overlay_get_ptr();
@ -663,7 +681,7 @@ bool input_overlay_load_overlays_resolve_iterate(void)
ol->active = &ol->overlays[0]; ol->active = &ol->overlays[0];
input_overlay_load_active(ol->deferred.opacity); input_overlay_load_active(ol->deferred.opacity);
input_overlay_enable(ol, ol->deferred.enable); input_overlay_enable(ol->deferred.enable);
} }
ol->resolve_pos += 1; ol->resolve_pos += 1;
@ -1046,22 +1064,6 @@ error:
return NULL; return NULL;
} }
/**
* input_overlay_enable:
* @ol : Overlay handle.
* @enable : Enable or disable the overlay
*
* Enable or disable the overlay.
**/
void input_overlay_enable(input_overlay_t *ol, bool enable)
{
if (!ol)
return;
ol->enable = enable;
if (ol->iface && ol->iface->enable)
ol->iface->enable(ol->iface_data, enable);
}
/** /**
* inside_hitbox: * inside_hitbox:
@ -1349,7 +1351,7 @@ void input_overlay_free(void)
if (!ol) if (!ol)
return; return;
input_overlay_free_overlays(ol); input_overlay_free_overlays();
if (ol->iface && ol->iface->enable) if (ol->iface && ol->iface->enable)
ol->iface->enable(ol->iface_data, false); ol->iface->enable(ol->iface_data, false);

11
input/input_overlay.h
View File

@ -119,8 +119,6 @@ input_overlay_t *input_overlay_new(const char *path, bool enable,
bool input_overlay_load_overlays(void); bool input_overlay_load_overlays(void);
bool input_overlay_load_overlays_image_iterate(input_overlay_t *ol);
bool input_overlay_load_overlays_iterate(void); bool input_overlay_load_overlays_iterate(void);
bool input_overlay_load_overlays_resolve_iterate(void); bool input_overlay_load_overlays_resolve_iterate(void);
@ -134,15 +132,6 @@ bool input_overlay_new_done(void);
**/ **/
void input_overlay_free(void); void input_overlay_free(void);
/**
* input_overlay_enable:
* @ol : Overlay handle.
* @enable : Enable or disable the overlay
*
* Enable or disable the overlay.
**/
void input_overlay_enable(input_overlay_t *ol, bool enable);
/** /**
* input_overlay_set_alpha_mod: * input_overlay_set_alpha_mod:
* @mod : New modulating factor to apply. * @mod : New modulating factor to apply.