From 4f3ae82ed3304689c32ac658f8e8bb8528c372c7 Mon Sep 17 00:00:00 2001 From: pstef <3462925+pstef@users.noreply.github.com> Date: Thu, 10 Apr 2025 16:10:43 +0000 Subject: [PATCH] Savestate thumbnails: selection is usually size_t --- menu/drivers/materialui.c | 2 +- menu/drivers/ozone.c | 12 ++++++------ menu/drivers/rgui.c | 4 ++-- menu/drivers/xmb.c | 4 ++-- menu/menu_driver.h | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 6a523bbe99..79a409caae 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -2424,7 +2424,7 @@ static void materialui_update_fullscreen_thumbnail_label( NULL); } -static void materialui_update_savestate_thumbnail_path(void *data, unsigned i) +static void materialui_update_savestate_thumbnail_path(void *data, size_t i) { settings_t *settings = config_get_ptr(); materialui_handle_t *mui = (materialui_handle_t*)data; diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index 214fc40a10..1bf3f9bc31 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -3705,7 +3705,7 @@ static bool ozone_is_main_menu_playlist(void *userdata) return entry.type == FILE_TYPE_RPL_ENTRY; } -static void ozone_update_savestate_thumbnail_path(void *data, unsigned i) +static void ozone_update_savestate_thumbnail_path(void *data, size_t i) { settings_t *settings = config_get_ptr(); ozone_handle_t *ozone = (ozone_handle_t*)data; @@ -10287,7 +10287,7 @@ static void ozone_render(void *data, && ozone->depth >= 2) || (ozone->flags & OZONE_FLAG_IS_STATE_SLOT)) { - ozone_update_savestate_thumbnail_path(ozone, (unsigned)i); + ozone_update_savestate_thumbnail_path(ozone, i); ozone_update_savestate_thumbnail_image(ozone); } } @@ -11560,7 +11560,7 @@ static void ozone_selection_changed(ozone_handle_t *ozone, bool allow_animation) ozone_update_thumbnail_image(ozone); } - ozone_update_savestate_thumbnail_path(ozone, (unsigned)ozone->selection); + ozone_update_savestate_thumbnail_path(ozone, ozone->selection); ozone_update_savestate_thumbnail_image(ozone); } } @@ -12284,7 +12284,7 @@ static void ozone_populate_entries( ozone_list_open(ozone, ozone_collapse_sidebar, (!(ozone->flags & OZONE_FLAG_FIRST_FRAME))); /* Reset savestate thumbnails always */ - ozone_update_savestate_thumbnail_path(ozone, (unsigned)menu_st->selection_ptr); + ozone_update_savestate_thumbnail_path(ozone, menu_st->selection_ptr); ozone_update_savestate_thumbnail_image(ozone); /* Thumbnails @@ -12313,7 +12313,7 @@ static void ozone_populate_entries( { ozone->flags &= ~(OZONE_FLAG_WANT_THUMBNAIL_BAR | OZONE_FLAG_SKIP_THUMBNAIL_RESET); - ozone_update_savestate_thumbnail_path(ozone, (unsigned)menu_st->selection_ptr); + ozone_update_savestate_thumbnail_path(ozone, menu_st->selection_ptr); ozone_update_savestate_thumbnail_image(ozone); } else if ( gfx_thumbnail_is_enabled(menu_st->thumbnail_path_data, GFX_THUMBNAIL_RIGHT) @@ -12423,7 +12423,7 @@ static void ozone_toggle(void *userdata, bool menu_on) ozone->flags &= ~(OZONE_FLAG_WANT_THUMBNAIL_BAR | OZONE_FLAG_SKIP_THUMBNAIL_RESET); gfx_thumbnail_reset(&ozone->thumbnails.savestate); - ozone_update_savestate_thumbnail_path(ozone, (unsigned)menu_st->selection_ptr); + ozone_update_savestate_thumbnail_path(ozone, menu_st->selection_ptr); ozone_update_savestate_thumbnail_image(ozone); } diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c index 4d6b2fd074..47725717bb 100644 --- a/menu/drivers/rgui.c +++ b/menu/drivers/rgui.c @@ -6872,7 +6872,7 @@ static void rgui_load_current_thumbnails(rgui_t *rgui, struct menu_state *menu_s #endif } -static void rgui_update_savestate_thumbnail_path(void *data, unsigned i) +static void rgui_update_savestate_thumbnail_path(void *data, size_t i) { settings_t *settings = config_get_ptr(); rgui_t *rgui = (rgui_t*)data; @@ -7072,7 +7072,7 @@ static void rgui_scan_selected_entry_thumbnail(rgui_t *rgui, bool force_load) /* Reset savestate thumbnails always */ if (selection < list_size) { - rgui_update_savestate_thumbnail_path(rgui, (unsigned)selection); + rgui_update_savestate_thumbnail_path(rgui, selection); rgui_update_savestate_thumbnail_image(rgui); } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 9597d2396d..49c3b7af2b 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -1233,7 +1233,7 @@ static void xmb_update_dynamic_wallpaper(xmb_handle_t *xmb, bool reset) } } -static void xmb_update_savestate_thumbnail_path(void *data, unsigned i) +static void xmb_update_savestate_thumbnail_path(void *data, size_t i) { xmb_handle_t *xmb = (xmb_handle_t*)data; settings_t *settings = config_get_ptr(); @@ -2127,7 +2127,7 @@ static void xmb_list_open_new(xmb_handle_t *xmb, /* This shows savestate thumbnail after * opening savestate submenu */ xmb->skip_thumbnail_reset = false; - xmb_update_savestate_thumbnail_path(xmb, (unsigned)current); + xmb_update_savestate_thumbnail_path(xmb, current); xmb_update_savestate_thumbnail_image(xmb); } diff --git a/menu/menu_driver.h b/menu/menu_driver.h index 6c765cc3bf..bb0716e3e0 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -391,7 +391,7 @@ typedef struct menu_ctx_driver void (*refresh_thumbnail_image)(void *data, unsigned i); void (*set_thumbnail_content)(void *data, const char *s); int (*osk_ptr_at_pos)(void *data, int x, int y, unsigned width, unsigned height); - void (*update_savestate_thumbnail_path)(void *data, unsigned i); + void (*update_savestate_thumbnail_path)(void *data, size_t i); void (*update_savestate_thumbnail_image)(void *data); int (*pointer_down)(void *data, unsigned x, unsigned y, unsigned ptr, menu_file_list_cbs_t *cbs,