diff options
-rw-r--r-- | apps/gui/skin_engine/wps_internals.h | 1 | ||||
-rw-r--r-- | apps/gui/wps.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h index 35d7b979fc..4db304297b 100644 --- a/apps/gui/skin_engine/wps_internals.h +++ b/apps/gui/skin_engine/wps_internals.h | |||
@@ -402,7 +402,6 @@ struct wps_state | |||
402 | struct mp3entry* id3; | 402 | struct mp3entry* id3; |
403 | struct mp3entry* nid3; | 403 | struct mp3entry* nid3; |
404 | int ff_rewind_count; | 404 | int ff_rewind_count; |
405 | bool ff_rewind; | ||
406 | bool paused; | 405 | bool paused; |
407 | bool is_fading; | 406 | bool is_fading; |
408 | }; | 407 | }; |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 4d22a83fd6..b1700459cc 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -207,6 +207,7 @@ static bool ffwd_rew(int button) | |||
207 | int direction = -1; /* forward=1 or backward=-1 */ | 207 | int direction = -1; /* forward=1 or backward=-1 */ |
208 | bool exit = false; | 208 | bool exit = false; |
209 | bool usb = false; | 209 | bool usb = false; |
210 | bool ff_rewind = false; | ||
210 | const long ff_rw_accel = (global_settings.ff_rewind_accel + 3); | 211 | const long ff_rw_accel = (global_settings.ff_rewind_accel + 3); |
211 | 212 | ||
212 | if (button == ACTION_NONE) | 213 | if (button == ACTION_NONE) |
@@ -222,7 +223,7 @@ static bool ffwd_rew(int button) | |||
222 | direction = 1; | 223 | direction = 1; |
223 | /* Fallthrough */ | 224 | /* Fallthrough */ |
224 | case ACTION_WPS_SEEKBACK: | 225 | case ACTION_WPS_SEEKBACK: |
225 | if (skin_get_global_state()->ff_rewind) | 226 | if (ff_rewind) |
226 | { | 227 | { |
227 | if (direction == 1) | 228 | if (direction == 1) |
228 | { | 229 | { |
@@ -260,7 +261,7 @@ static bool ffwd_rew(int button) | |||
260 | else | 261 | else |
261 | status_set_ffmode(STATUS_FASTBACKWARD); | 262 | status_set_ffmode(STATUS_FASTBACKWARD); |
262 | 263 | ||
263 | skin_get_global_state()->ff_rewind = true; | 264 | ff_rewind = true; |
264 | 265 | ||
265 | step = 1000 * global_settings.ff_rewind_min_step; | 266 | step = 1000 * global_settings.ff_rewind_min_step; |
266 | } | 267 | } |
@@ -296,7 +297,7 @@ static bool ffwd_rew(int button) | |||
296 | skin_get_global_state()->id3->elapsed = skin_get_global_state()->id3->elapsed+ff_rewind_count; | 297 | skin_get_global_state()->id3->elapsed = skin_get_global_state()->id3->elapsed+ff_rewind_count; |
297 | audio_ff_rewind(skin_get_global_state()->id3->elapsed); | 298 | audio_ff_rewind(skin_get_global_state()->id3->elapsed); |
298 | skin_get_global_state()->ff_rewind_count = 0; | 299 | skin_get_global_state()->ff_rewind_count = 0; |
299 | skin_get_global_state()->ff_rewind = false; | 300 | ff_rewind = false; |
300 | status_set_ffmode(0); | 301 | status_set_ffmode(0); |
301 | exit = true; | 302 | exit = true; |
302 | break; | 303 | break; |
@@ -1046,7 +1047,6 @@ static void track_info_callback(unsigned short id, void *param) | |||
1046 | static void wps_state_init(void) | 1047 | static void wps_state_init(void) |
1047 | { | 1048 | { |
1048 | struct wps_state *state = skin_get_global_state(); | 1049 | struct wps_state *state = skin_get_global_state(); |
1049 | state->ff_rewind = false; | ||
1050 | state->paused = false; | 1050 | state->paused = false; |
1051 | if(audio_status() & AUDIO_STATUS_PLAY) | 1051 | if(audio_status() & AUDIO_STATUS_PLAY) |
1052 | { | 1052 | { |