diff options
Diffstat (limited to 'apps/gui/gwps.h')
-rw-r--r-- | apps/gui/gwps.h | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index b5fddd556f..d8cc6a78c0 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -145,7 +145,7 @@ | |||
145 | #define WPS_INCVOL BUTTON_UP | 145 | #define WPS_INCVOL BUTTON_UP |
146 | #define WPS_DECVOL BUTTON_DOWN | 146 | #define WPS_DECVOL BUTTON_DOWN |
147 | #define WPS_PAUSE BUTTON_OFF | 147 | #define WPS_PAUSE BUTTON_OFF |
148 | /* #define WPS_MENU Ondio can't have both main menu and context menu in wps */ | 148 | /* #define WPS_MENU Ondio can't have both main menu and context menu in wps */ |
149 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) | 149 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) |
150 | #define WPS_BROWSE_PRE BUTTON_MENU | 150 | #define WPS_BROWSE_PRE BUTTON_MENU |
151 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | 151 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) |
@@ -183,7 +183,7 @@ | |||
183 | #define WPS_INCVOL BUTTON_UP | 183 | #define WPS_INCVOL BUTTON_UP |
184 | #define WPS_DECVOL BUTTON_DOWN | 184 | #define WPS_DECVOL BUTTON_DOWN |
185 | #define WPS_PAUSE BUTTON_OFF | 185 | #define WPS_PAUSE BUTTON_OFF |
186 | /* #define WPS_MENU iPod can't have both main menu and context menu in wps */ | 186 | /* #define WPS_MENU iPod can't have both main menu and context menu in wps */ |
187 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) | 187 | #define WPS_BROWSE (BUTTON_MENU | BUTTON_REL) |
188 | #define WPS_BROWSE_PRE BUTTON_MENU | 188 | #define WPS_BROWSE_PRE BUTTON_MENU |
189 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) | 189 | #define WPS_KEYLOCK (BUTTON_MENU | BUTTON_DOWN) |
@@ -253,6 +253,8 @@ struct wps_data | |||
253 | #ifdef HAVE_LCD_BITMAP | 253 | #ifdef HAVE_LCD_BITMAP |
254 | struct gui_img img[MAX_IMAGES]; | 254 | struct gui_img img[MAX_IMAGES]; |
255 | unsigned char img_buf[IMG_BUFSIZE]; | 255 | unsigned char img_buf[IMG_BUFSIZE]; |
256 | bool wps_sb_tag; | ||
257 | bool show_sb_on_wps; | ||
256 | #endif | 258 | #endif |
257 | #ifdef HAVE_LCD_CHARCELLS | 259 | #ifdef HAVE_LCD_CHARCELLS |
258 | unsigned char wps_progress_pat[8]; | 260 | unsigned char wps_progress_pat[8]; |
@@ -274,7 +276,10 @@ void wps_data_init(struct wps_data *wps_data); | |||
274 | 276 | ||
275 | /* to setup up the wps-data from a format-buffer (isfile = false) | 277 | /* to setup up the wps-data from a format-buffer (isfile = false) |
276 | from a (wps-)file (isfile = true)*/ | 278 | from a (wps-)file (isfile = true)*/ |
277 | bool wps_data_load(struct wps_data *wps_data, const char *buf, bool isfile, bool display); | 279 | bool wps_data_load(struct wps_data *wps_data, |
280 | const char *buf, | ||
281 | bool isfile, | ||
282 | bool display); | ||
278 | 283 | ||
279 | /* wps_data end */ | 284 | /* wps_data end */ |
280 | 285 | ||
@@ -301,13 +306,6 @@ void wps_state_init(void); | |||
301 | else we are in normal mode */ | 306 | else we are in normal mode */ |
302 | void wps_state_update_ff_rew(bool ff_rew); | 307 | void wps_state_update_ff_rew(bool ff_rew); |
303 | 308 | ||
304 | /* change the paused-status | ||
305 | to indicate if playback is currently paused or not */ | ||
306 | void wps_state_update_paused(bool paused); | ||
307 | |||
308 | /* change the path to the current played track */ | ||
309 | void wps_state_update_ctp(const char *path); | ||
310 | |||
311 | /* change the tag-information of the current played track | 309 | /* change the tag-information of the current played track |
312 | and the following track */ | 310 | and the following track */ |
313 | void wps_state_update_id3_nid3(struct mp3entry *id3, struct mp3entry *nid3); | 311 | void wps_state_update_id3_nid3(struct mp3entry *id3, struct mp3entry *nid3); |
@@ -318,7 +316,7 @@ void wps_state_update_id3_nid3(struct mp3entry *id3, struct mp3entry *nid3); | |||
318 | and the screen on which the wps-content should be drawn */ | 316 | and the screen on which the wps-content should be drawn */ |
319 | struct gui_wps | 317 | struct gui_wps |
320 | { | 318 | { |
321 | struct screen * display; | 319 | struct screen * display; |
322 | struct wps_data *data; | 320 | struct wps_data *data; |
323 | struct wps_state *state; | 321 | struct wps_state *state; |
324 | }; | 322 | }; |
@@ -333,16 +331,11 @@ void gui_wps_set_data(struct gui_wps *gui_wps, struct wps_data *data); | |||
333 | void gui_wps_set_disp(struct gui_wps *gui_wps, struct screen *display); | 331 | void gui_wps_set_disp(struct gui_wps *gui_wps, struct screen *display); |
334 | /* gui_wps end */ | 332 | /* gui_wps end */ |
335 | 333 | ||
336 | struct gui_syncwps | ||
337 | { | ||
338 | struct gui_wps gui_wps[NB_SCREENS]; | ||
339 | }; | ||
340 | long gui_wps_show(void); | 334 | long gui_wps_show(void); |
341 | 335 | ||
342 | /* currently only on wps_state is needed */ | 336 | /* currently only on wps_state is needed */ |
343 | extern struct wps_state wps_state; | 337 | extern struct wps_state wps_state; |
344 | extern struct gui_syncwps gui_syncwps; | 338 | extern struct gui_wps gui_wps[NB_SCREENS]; |
345 | extern struct wps_data wps_datas[NB_SCREENS]; | ||
346 | 339 | ||
347 | void gui_sync_wps_init(void); | 340 | void gui_sync_wps_init(void); |
348 | void gui_sync_data_wps_init(void); | 341 | void gui_sync_data_wps_init(void); |