summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-07-10 11:53:15 +0000
committerThomas Martitz <kugel@rockbox.org>2009-07-10 11:53:15 +0000
commit989ed2be017f8f613251a26066ae41ab1a10eae4 (patch)
tree49c831412dcc10c14fccfd3c249cceb1f5ba01a0
parent80b4e5d55da5b9075615556191dfd4599b129dd9 (diff)
downloadrockbox-989ed2be017f8f613251a26066ae41ab1a10eae4.tar.gz
rockbox-989ed2be017f8f613251a26066ae41ab1a10eae4.zip
Fix a few comments in gwps.c.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21740 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/gwps.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 95cca5c117..827af655df 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -258,7 +258,7 @@ static void gwps_fix_statusbars(void)
258#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 258#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
259/* 259/*
260 * If the user is unable to see the wps, because the display is deactivated, 260 * If the user is unable to see the wps, because the display is deactivated,
261 * we surpress updates until the wps gets actived again (the lcd driver will 261 * we surpress updates until the wps is actived again (the lcd driver will
262 * call this hook to issue an instant update) 262 * call this hook to issue an instant update)
263 * */ 263 * */
264static void wps_lcd_activation_hook(void) 264static void wps_lcd_activation_hook(void)
@@ -315,7 +315,7 @@ int wps_get_touchaction(struct wps_data *data)
315 /* reposition the touch inside the viewport */ 315 /* reposition the touch inside the viewport */
316 vx = x - r->wvp->vp.x; 316 vx = x - r->wvp->vp.x;
317 vy = y - r->wvp->vp.y; 317 vy = y - r->wvp->vp.y;
318 /* check if its inside this viewport */ 318 /* check if it's inside this viewport */
319 if (vx >= 0 && vx < r->wvp->vp.x + r->wvp->vp.width && 319 if (vx >= 0 && vx < r->wvp->vp.x + r->wvp->vp.width &&
320 vy >= 0 && vy < r->wvp->vp.y + r->wvp->vp.height) 320 vy >= 0 && vy < r->wvp->vp.y + r->wvp->vp.height)
321 { 321 {
@@ -768,8 +768,10 @@ long gui_wps_show(void)
768 audio_flush_and_reload_tracks(); 768 audio_flush_and_reload_tracks();
769 } 769 }
770 break; 770 break;
771#endif /* HAVE_TOUCHSCREEN */ 771#endif /* HAVE_TOUCHSCREEN */
772 case ACTION_REDRAW: /* yes are locked, just redraw */ 772 /* this case is used by the softlock feature
773 * it requests a full update here */
774 case ACTION_REDRAW:
773 wps_state.do_full_update = true; 775 wps_state.do_full_update = true;
774 break; 776 break;
775 case ACTION_NONE: /* Timeout, do a partial update */ 777 case ACTION_NONE: /* Timeout, do a partial update */
@@ -894,7 +896,6 @@ static void nextid3available_callback(void* param)
894 wps_state.do_full_update = true; 896 wps_state.do_full_update = true;
895} 897}
896 898
897/* wps_state */
898 899
899static void wps_state_init(void) 900static void wps_state_init(void)
900{ 901{
@@ -917,7 +918,6 @@ static void wps_state_init(void)
917 add_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, false, nextid3available_callback); 918 add_event(PLAYBACK_EVENT_NEXTTRACKID3_AVAILABLE, false, nextid3available_callback);
918} 919}
919 920
920/* wps_state end*/
921 921
922#ifdef HAVE_LCD_BITMAP 922#ifdef HAVE_LCD_BITMAP
923static void statusbar_toggle_handler(void *data) 923static void statusbar_toggle_handler(void *data)
@@ -960,7 +960,7 @@ void gui_sync_wps_init(void)
960 gui_wps[i].data = &wps_datas[i]; 960 gui_wps[i].data = &wps_datas[i];
961 gui_wps[i].display = &screens[i]; 961 gui_wps[i].display = &screens[i];
962 /* Currently no seperate wps_state needed/possible 962 /* Currently no seperate wps_state needed/possible
963 so use the only aviable ( "global" ) one */ 963 so use the only available ( "global" ) one */
964 gui_wps[i].state = &wps_state; 964 gui_wps[i].state = &wps_state;
965 } 965 }
966#ifdef HAVE_LCD_BITMAP 966#ifdef HAVE_LCD_BITMAP