diff options
-rw-r--r-- | apps/gui/wps.c | 7 | ||||
-rw-r--r-- | apps/gui/wps.h | 17 |
2 files changed, 3 insertions, 21 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index 01f6e5c77c..1c1422967d 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -203,7 +203,7 @@ static int skintouch_to_wps(struct wps_data *data) | |||
203 | } | 203 | } |
204 | #endif /* HAVE_TOUCHSCREEN */ | 204 | #endif /* HAVE_TOUCHSCREEN */ |
205 | 205 | ||
206 | bool ffwd_rew(int button) | 206 | static bool ffwd_rew(int button) |
207 | { | 207 | { |
208 | unsigned int step = 0; /* current ff/rewind step */ | 208 | unsigned int step = 0; /* current ff/rewind step */ |
209 | unsigned int max_step = 0; /* maximum ff/rewind step */ | 209 | unsigned int max_step = 0; /* maximum ff/rewind step */ |
@@ -1081,9 +1081,4 @@ bool is_wps_fading(void) | |||
1081 | { | 1081 | { |
1082 | return skin_get_global_state()->is_fading; | 1082 | return skin_get_global_state()->is_fading; |
1083 | } | 1083 | } |
1084 | |||
1085 | int wps_get_ff_rewind_count(void) | ||
1086 | { | ||
1087 | return skin_get_global_state()->ff_rewind_count; | ||
1088 | } | ||
1089 | #endif | 1084 | #endif |
diff --git a/apps/gui/wps.h b/apps/gui/wps.h index a463b0e9bb..a2893a3902 100644 --- a/apps/gui/wps.h +++ b/apps/gui/wps.h | |||
@@ -20,32 +20,19 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #ifndef _WPS_H_ | 21 | #ifndef _WPS_H_ |
22 | #define _WPS_H_ | 22 | #define _WPS_H_ |
23 | |||
23 | #include <stdbool.h> | 24 | #include <stdbool.h> |
24 | #include "config.h" | ||
25 | #include "screen_access.h" | ||
26 | |||
27 | long gui_wps_show(void); | ||
28 | |||
29 | /* wrapper for the wps to load the skin (.wps/.rwps) files */ | ||
30 | void wps_data_load(enum screen_type, const char *, bool); | ||
31 | 25 | ||
32 | void gui_sync_wps_init(void) INIT_ATTR; | 26 | long gui_wps_show(void); |
33 | 27 | ||
34 | /* fade (if enabled) and pause the audio, optionally rewind a little */ | 28 | /* fade (if enabled) and pause the audio, optionally rewind a little */ |
35 | void pause_action(bool may_fade, bool updatewps); | 29 | void pause_action(bool may_fade, bool updatewps); |
36 | void unpause_action(bool may_fade, bool updatewps); | 30 | void unpause_action(bool may_fade, bool updatewps); |
37 | |||
38 | /* fades the volume, e.g. on pause or stop */ | ||
39 | void fade(bool fade_in, bool updatewps); | ||
40 | |||
41 | bool ffwd_rew(int button); | ||
42 | void wps_do_playpause(bool updatewps); | 31 | void wps_do_playpause(bool updatewps); |
43 | 32 | ||
44 | #ifdef IPOD_ACCESSORY_PROTOCOL | 33 | #ifdef IPOD_ACCESSORY_PROTOCOL |
45 | /* whether the wps is fading the volume due to pausing/stopping */ | 34 | /* whether the wps is fading the volume due to pausing/stopping */ |
46 | bool is_wps_fading(void); | 35 | bool is_wps_fading(void); |
47 | /* return length of the current ff or rewin action, IAP needs this */ | ||
48 | int wps_get_ff_rewind_count(void); | ||
49 | #endif /* IPOD_ACCESSORY_PROTOCOL */ | 36 | #endif /* IPOD_ACCESSORY_PROTOCOL */ |
50 | 37 | ||
51 | /* in milliseconds */ | 38 | /* in milliseconds */ |