len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove ff_rewind from global WPS state

Browse source 
Turns out it's local to ffwd_rewind() in the WPS.

Change-Id: Iaa6e69185db67b8aad61f1d2ad29c98f15f37370
This commit is contained in:
Aidan MacDonald 2022-10-02 20:42:25 +01:00
parent 6e4c866756
commit 33a47e4a49
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
apps/gui/skin_engine/wps_internals.h
View file

@ -402,7 +402,6 @@ struct wps_state
struct mp3entry* id3; struct mp3entry* id3;
struct mp3entry* nid3; struct mp3entry* nid3;
int ff_rewind_count; int ff_rewind_count;
bool ff_rewind;
bool paused; bool paused;
bool is_fading; bool is_fading;
}; };

8
apps/gui/wps.c
View file

@ -207,6 +207,7 @@ static bool ffwd_rew(int button)
int direction = -1; /* forward=1 or backward=-1 */ int direction = -1; /* forward=1 or backward=-1 */
bool exit = false; bool exit = false;
bool usb = false; bool usb = false;
bool ff_rewind = false;
const long ff_rw_accel = (global_settings.ff_rewind_accel + 3); const long ff_rw_accel = (global_settings.ff_rewind_accel + 3);
if (button == ACTION_NONE) if (button == ACTION_NONE)
@ -222,7 +223,7 @@ static bool ffwd_rew(int button)
direction = 1; direction = 1;
/* Fallthrough */ /* Fallthrough */
case ACTION_WPS_SEEKBACK: case ACTION_WPS_SEEKBACK:
if (skin_get_global_state()->ff_rewind) if (ff_rewind)
{ {
if (direction == 1) if (direction == 1)
{ {
@ -260,7 +261,7 @@ static bool ffwd_rew(int button)
else else
status_set_ffmode(STATUS_FASTBACKWARD); status_set_ffmode(STATUS_FASTBACKWARD);
skin_get_global_state()->ff_rewind = true; ff_rewind = true;
step = 1000 * global_settings.ff_rewind_min_step; step = 1000 * global_settings.ff_rewind_min_step;
} }
@ -296,7 +297,7 @@ static bool ffwd_rew(int button)
skin_get_global_state()->id3->elapsed = skin_get_global_state()->id3->elapsed+ff_rewind_count; skin_get_global_state()->id3->elapsed = skin_get_global_state()->id3->elapsed+ff_rewind_count;
audio_ff_rewind(skin_get_global_state()->id3->elapsed); audio_ff_rewind(skin_get_global_state()->id3->elapsed);
skin_get_global_state()->ff_rewind_count = 0; skin_get_global_state()->ff_rewind_count = 0;
skin_get_global_state()->ff_rewind = false; ff_rewind = false;
status_set_ffmode(0); status_set_ffmode(0);
exit = true; exit = true;
break; break;
@ -1046,7 +1047,6 @@ static void track_info_callback(unsigned short id, void *param)
static void wps_state_init(void) static void wps_state_init(void)
{ {
struct wps_state *state = skin_get_global_state(); struct wps_state *state = skin_get_global_state();
state->ff_rewind = false;
state->paused = false; state->paused = false;
if(audio_status() & AUDIO_STATUS_PLAY) if(audio_status() & AUDIO_STATUS_PLAY)
{ {