Skip to content

Commit 5772689

Browse files
pstefpstef
committed
Finish converting selection variables to size_t
fixes 5710a7f
1 parent ab3b321 commit 5772689

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

‎menu/drivers/ozone.c‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4592,7 +4592,7 @@ static void ozone_change_tab(ozone_handle_t *ozone,
45924592
menu_driver_deferred_push_content_list(selection_buf);
45934593
}
45944594

4595-
static void ozone_sidebar_goto(ozone_handle_t *ozone, unsigned new_selection)
4595+
static void ozone_sidebar_goto(ozone_handle_t *ozone, size_t new_selection)
45964596
{
45974597
static const enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = {
45984598
MENU_ENUM_LABEL_MAIN_MENU,
@@ -8125,17 +8125,17 @@ static enum menu_action ozone_parse_menu_entry_action(
81258125
: ozone->categories_selection_ptr;
81268126

81278127
new_selection = random_range((unsigned)(ozone->system_tab_end + 1), (unsigned)(ozone->system_tab_end + horizontal_list_size));
8128-
while (new_selection == (int)tab_selection)
8128+
while (new_selection == tab_selection)
81298129
new_selection = random_range((unsigned)(ozone->system_tab_end + 1), (unsigned)(ozone->system_tab_end + horizontal_list_size));
81308130

8131-
if (new_selection != (int)tab_selection)
8131+
if (new_selection != tab_selection)
81328132
ozone_sidebar_goto(ozone, new_selection);
81338133

81348134
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
81358135
new_action = MENU_ACTION_NOOP;
81368136

81378137
#ifdef HAVE_AUDIOMIXER
8138-
if (new_selection != (int)selection)
8138+
if (new_selection != selection)
81398139
audio_driver_mixer_play_scroll_sound(true);
81408140
#endif
81418141
break;
@@ -8231,16 +8231,16 @@ static enum menu_action ozone_parse_menu_entry_action(
82318231
? ozone_get_onscreen_category_selection(ozone)
82328232
: ozone->categories_selection_ptr;
82338233

8234-
new_selection = (int)(selection + 1);
8234+
new_selection = selection + 1;
82358235

8236-
if (new_selection >= (int)(ozone->system_tab_end + horizontal_list_size + 1))
8236+
if (new_selection >= ozone->system_tab_end + horizontal_list_size + 1)
82378237
new_selection = 0;
82388238

82398239
if ( !menu_navigation_wraparound_enable
82408240
&& selection == ozone->system_tab_end + horizontal_list_size)
8241-
new_selection = (int)selection;
8241+
new_selection = selection;
82428242

8243-
if (new_selection != (int)selection)
8243+
if (new_selection != selection)
82448244
{
82458245
ozone_sidebar_goto(ozone, new_selection);
82468246
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
@@ -8253,7 +8253,7 @@ static enum menu_action ozone_parse_menu_entry_action(
82538253
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
82548254

82558255
#ifdef HAVE_AUDIOMIXER
8256-
if (new_selection != (int)selection)
8256+
if (new_selection != selection)
82578257
audio_driver_mixer_play_scroll_sound(false);
82588258
#endif
82598259
break;
@@ -8288,7 +8288,7 @@ static enum menu_action ozone_parse_menu_entry_action(
82888288
&& selection == 0)
82898289
new_selection = 0;
82908290

8291-
if (new_selection != (int)selection)
8291+
if (new_selection != selection)
82928292
{
82938293
ozone_sidebar_goto(ozone, new_selection);
82948294
new_action = MENU_ACTION_ACCESSIBILITY_SPEAK_TITLE;
@@ -8301,7 +8301,7 @@ static enum menu_action ozone_parse_menu_entry_action(
83018301
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
83028302

83038303
#ifdef HAVE_AUDIOMIXER
8304-
if (new_selection != (int)selection)
8304+
if (new_selection != selection)
83058305
audio_driver_mixer_play_scroll_sound(true);
83068306
#endif
83078307
break;
@@ -8505,7 +8505,7 @@ static enum menu_action ozone_parse_menu_entry_action(
85058505
{
85068506
ozone->flags2 &= ~OZONE_FLAG2_PENDING_CURSOR_IN_SIDEBAR;
85078507
ozone->flags |= OZONE_FLAG_CURSOR_IN_SIDEBAR;
8508-
ozone_sidebar_goto(ozone, (unsigned)ozone->categories_selection_ptr);
8508+
ozone_sidebar_goto(ozone, ozone->categories_selection_ptr);
85098509
}
85108510
break;
85118511
case MENU_ACTION_SCROLL_UP:
@@ -8539,18 +8539,18 @@ static enum menu_action ozone_parse_menu_entry_action(
85398539

85408540
if (tab_selection < (size_t)(ozone->system_tab_end + 1))
85418541
new_selection = 0;
8542-
else if ((int)tab_selection > (int)ozone->system_tab_end - new_selection
8542+
else if (tab_selection > ozone->system_tab_end - new_selection
85438543
|| new_selection < 0)
8544-
new_selection = (int)(ozone->system_tab_end + 1);
8544+
new_selection = ozone->system_tab_end + 1;
85458545

8546-
if (new_selection != (int)tab_selection)
8546+
if (new_selection != tab_selection)
85478547
ozone_sidebar_goto(ozone, new_selection);
85488548

85498549
new_action = MENU_ACTION_NOOP;
85508550
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
85518551

85528552
#ifdef HAVE_AUDIOMIXER
8553-
if (new_selection != (int)selection)
8553+
if (new_selection != selection)
85548554
audio_driver_mixer_play_scroll_sound(true);
85558555
#endif
85568556
break;
@@ -8602,17 +8602,17 @@ static enum menu_action ozone_parse_menu_entry_action(
86028602
new_selection = ozone->system_tab_end + 1;
86038603
}
86048604

8605-
if (new_selection > (int)(ozone->system_tab_end + horizontal_list_size))
8606-
new_selection = (int)(ozone->system_tab_end + horizontal_list_size);
8605+
if (new_selection > ozone->system_tab_end + horizontal_list_size)
8606+
new_selection = ozone->system_tab_end + horizontal_list_size;
86078607

8608-
if (new_selection != (int)tab_selection)
8608+
if (new_selection != tab_selection)
86098609
ozone_sidebar_goto(ozone, new_selection);
86108610

86118611
new_action = MENU_ACTION_NOOP;
86128612
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
86138613

86148614
#ifdef HAVE_AUDIOMIXER
8615-
if (new_selection != (int)selection)
8615+
if (new_selection != selection)
86168616
audio_driver_mixer_play_scroll_sound(false);
86178617
#endif
86188618
break;
@@ -8641,16 +8641,16 @@ static enum menu_action ozone_parse_menu_entry_action(
86418641
new_selection = 0;
86428642

86438643
if (tab_selection > ozone->system_tab_end)
8644-
new_selection = (int)(ozone->system_tab_end + 1);
8644+
new_selection = ozone->system_tab_end + 1;
86458645

8646-
if (new_selection != (int)tab_selection)
8646+
if (new_selection != tab_selection)
86478647
ozone_sidebar_goto(ozone, new_selection);
86488648

86498649
new_action = MENU_ACTION_NOOP;
86508650
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
86518651

86528652
#ifdef HAVE_AUDIOMIXER
8653-
if (new_selection != (int)selection)
8653+
if (new_selection != selection)
86548654
audio_driver_mixer_play_scroll_sound(true);
86558655
#endif
86568656
break;
@@ -8667,14 +8667,14 @@ static enum menu_action ozone_parse_menu_entry_action(
86678667

86688668
new_selection = ozone->system_tab_end + horizontal_list_size;
86698669

8670-
if (new_selection != (int)tab_selection)
8670+
if (new_selection != tab_selection)
86718671
ozone_sidebar_goto(ozone, new_selection);
86728672

86738673
new_action = MENU_ACTION_NOOP;
86748674
ozone->flags &= ~OZONE_FLAG_CURSOR_MODE;
86758675

86768676
#ifdef HAVE_AUDIOMIXER
8677-
if (new_selection != (int)selection)
8677+
if (new_selection != selection)
86788678
audio_driver_mixer_play_scroll_sound(false);
86798679
#endif
86808680
break;
@@ -12803,7 +12803,7 @@ static int ozone_pointer_up(void *userdata,
1280312803

1280412804
/* Ensure that current category is valid */
1280512805
if (ozone->pointer_categories_selection <= ozone->system_tab_end + horizontal_list_size)
12806-
ozone_sidebar_goto(ozone, (unsigned)ozone->pointer_categories_selection);
12806+
ozone_sidebar_goto(ozone, ozone->pointer_categories_selection);
1280712807
}
1280812808
}
1280912809
break;

0 commit comments

Comments
 (0)