summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorJerome Kuptz <jeromekuptz@gmail.com>2002-07-02 05:50:27 +0000
committerJerome Kuptz <jeromekuptz@gmail.com>2002-07-02 05:50:27 +0000
commit6feb9838c84539aafc2b0ef228ac094072243217 (patch)
treee14ca43f51b97aef8d76eaf18909962664cc3b73 /apps
parent13059a4c6d2d61141b84584f1ef141522e7a11c3 (diff)
downloadrockbox-6feb9838c84539aafc2b0ef228ac094072243217.tar.gz
rockbox-6feb9838c84539aafc2b0ef228ac094072243217.zip
changed the checks around a bit for time display
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1296 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/wps.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/apps/wps.c b/apps/wps.c
index 04346adc16..7b0cf5d60f 100644
--- a/apps/wps.c
+++ b/apps/wps.c
@@ -142,20 +142,30 @@ int wps_show(void)
142 142
143 if (playing) 143 if (playing)
144 { 144 {
145#ifdef HAVE_LCD_BITMAP
145 snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d", 146 snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d",
146 id3->elapsed / 60000, 147 id3->elapsed / 60000,
147 id3->elapsed % 60000 / 1000, 148 id3->elapsed % 60000 / 1000,
148 id3->length / 60000, 149 id3->length / 60000,
149 id3->length % 60000 / 1000 ); 150 id3->length % 60000 / 1000 );
150 151
151#ifdef HAVE_LCD_BITMAP
152 lcd_puts(0, 6, buffer); 152 lcd_puts(0, 6, buffer);
153 lcd_update();
153#else 154#else
154 // Display time with the filename scroll only because the screen has room. 155 // Display time with the filename scroll only because the screen has room.
155 if (global_settings.wps_display == PLAY_DISPLAY_FILENAME_SCROLL) 156 if (global_settings.wps_display == PLAY_DISPLAY_FILENAME_SCROLL)
157 {
158
159 snprintf(buffer,sizeof(buffer), "Time: %d:%02d / %d:%02d",
160 id3->elapsed / 60000,
161 id3->elapsed % 60000 / 1000,
162 id3->length / 60000,
163 id3->length % 60000 / 1000 );
164
156 lcd_puts(0, 1, buffer); 165 lcd_puts(0, 1, buffer);
166 lcd_update();
167 }
157#endif 168#endif
158 lcd_update();
159 } 169 }
160 for ( i=0;i<5;i++ ) { 170 for ( i=0;i<5;i++ ) {
161 switch ( button_get(false) ) { 171 switch ( button_get(false) ) {
@@ -206,7 +216,6 @@ int wps_show(void)
206#endif 216#endif
207 mpeg_stop(); 217 mpeg_stop();
208 break; 218 break;
209
210#ifndef SIMULATOR 219#ifndef SIMULATOR
211 case SYS_USB_CONNECTED: 220 case SYS_USB_CONNECTED:
212 /* Tell the USB thread that we are safe */ 221 /* Tell the USB thread that we are safe */