summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZakk Roberts <midk@rockbox.org>2004-08-05 11:24:27 +0000
committerZakk Roberts <midk@rockbox.org>2004-08-05 11:24:27 +0000
commit87ab7cef1157eab880618bdfc5878690a14d9410 (patch)
tree7cd8b72b126ced74eefd46e0420eb9b61bd949d7
parent3a77069878b7aac2be134db6f45f5a395f4c6e84 (diff)
downloadrockbox-87ab7cef1157eab880618bdfc5878690a14d9410.tar.gz
rockbox-87ab7cef1157eab880618bdfc5878690a14d9410.zip
Removed extra const
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4988 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/clock.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 227295b6cc..cec303bbb1 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -19,7 +19,7 @@
19 19
20/***************************** 20/*****************************
21 * RELEASE NOTES 21 * RELEASE NOTES
22 22
23***** VERSION 2.50 ** 23***** VERSION 2.50 **
24-New general settings mode added, -reworked options screen, 24-New general settings mode added, -reworked options screen,
25-cleaned up a few things and removed redundant code, -faster 25-cleaned up a few things and removed redundant code, -faster
@@ -264,7 +264,7 @@ const unsigned char clocklogo[] = {
264/****************** 264/******************
265 * Time's Up bitmap 265 * Time's Up bitmap
266 *****************/ 266 *****************/
267const const unsigned char timesup[] = { 267const unsigned char timesup[] = {
2680x78, 0x78, 0x78, 0x38, 0x08, 0x08, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x04, 2680x78, 0x78, 0x78, 0x38, 0x08, 0x08, 0xf8, 0xfc, 0xfc, 0xfc, 0xfc, 0xfc, 0x04,
2690x04, 0x04, 0x0c, 0x3c, 0x3c, 0x3c, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfc, 2690x04, 0x04, 0x0c, 0x3c, 0x3c, 0x3c, 0x04, 0x04, 0x04, 0xfc, 0xfc, 0xfc, 0xfc,
2700xfe, 0xfe, 0x06, 0x03, 0x03, 0x05, 0x05, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff, 2700xfe, 0xfe, 0x06, 0x03, 0x03, 0x05, 0x05, 0x07, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -482,9 +482,9 @@ void save_settings(bool interface)
482 if(interface) 482 if(interface)
483 { 483 {
484 rb->lcd_update(); 484 rb->lcd_update();
485 485
486 rb->sleep(HZ); 486 rb->sleep(HZ);
487 487
488 exit_logo(); 488 exit_logo();
489 } 489 }
490} 490}
@@ -1283,7 +1283,7 @@ bool f1_screen(void)
1283 while (!done) 1283 while (!done)
1284 { 1284 {
1285 rb->lcd_clear_display(); 1285 rb->lcd_clear_display();
1286 1286
1287 if(screen == 1) 1287 if(screen == 1)
1288 { 1288 {
1289 rb->snprintf(buf, sizeof(buf), "<<---- 1/9 NEXT>>"); 1289 rb->snprintf(buf, sizeof(buf), "<<---- 1/9 NEXT>>");
@@ -1295,7 +1295,7 @@ bool f1_screen(void)
1295 rb->snprintf(buf, sizeof(buf), "<<BACK 9/9 ---->>"); 1295 rb->snprintf(buf, sizeof(buf), "<<BACK 9/9 ---->>");
1296 rb->lcd_getstringsize(buf, &buf_w, &buf_h); 1296 rb->lcd_getstringsize(buf, &buf_w, &buf_h);
1297 rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 56, buf); 1297 rb->lcd_putsxy(LCD_WIDTH/2-buf_w/2, 56, buf);
1298 } 1298 }
1299 else 1299 else
1300 { 1300 {
1301 rb->snprintf(buf, sizeof(buf), "<<BACK %d/9 NEXT>>", screen); 1301 rb->snprintf(buf, sizeof(buf), "<<BACK %d/9 NEXT>>", screen);
@@ -1450,14 +1450,14 @@ bool f3_screen(void)
1450 while (!done) 1450 while (!done)
1451 { 1451 {
1452 rb->lcd_clear_display(); 1452 rb->lcd_clear_display();
1453 1453
1454 rb->lcd_puts(0, 1, "UP/DN: move, L/R:"); 1454 rb->lcd_puts(0, 1, "UP/DN: move, L/R:");
1455 rb->lcd_puts(0, 2, "change, OFF: done"); 1455 rb->lcd_puts(0, 2, "change, OFF: done");
1456 1456
1457 if(settings.clock == 1) 1457 if(settings.clock == 1)
1458 { 1458 {
1459 rb->lcd_puts(0, 0, "OPTIONS (Analog)"); 1459 rb->lcd_puts(0, 0, "OPTIONS (Analog)");
1460 1460
1461 rb->lcd_puts(2, 4, "Digits"); 1461 rb->lcd_puts(2, 4, "Digits");
1462 1462
1463 if(settings.analog_date == 0) 1463 if(settings.analog_date == 0)
@@ -1478,21 +1478,21 @@ bool f3_screen(void)
1478 1478
1479 /* Draw checkboxes */ 1479 /* Draw checkboxes */
1480 draw_checkbox(settings.analog_digits, 1, 33); 1480 draw_checkbox(settings.analog_digits, 1, 33);
1481 1481
1482 if(settings.analog_date == 0) 1482 if(settings.analog_date == 0)
1483 rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6, true); 1483 rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6, true);
1484 else if(settings.analog_date == 1) 1484 else if(settings.analog_date == 1)
1485 rb->lcd_bitmap(checkbox_half, 1, 41, 8, 6, true); 1485 rb->lcd_bitmap(checkbox_half, 1, 41, 8, 6, true);
1486 else 1486 else
1487 rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6, true); 1487 rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6, true);
1488 1488
1489 if(settings.analog_time == 0) 1489 if(settings.analog_time == 0)
1490 rb->lcd_bitmap(checkbox_empty, 1, 49, 8, 6, true); 1490 rb->lcd_bitmap(checkbox_empty, 1, 49, 8, 6, true);
1491 else if(settings.analog_time == 1) 1491 else if(settings.analog_time == 1)
1492 rb->lcd_bitmap(checkbox_half, 1, 49, 8, 6, true); 1492 rb->lcd_bitmap(checkbox_half, 1, 49, 8, 6, true);
1493 else 1493 else
1494 rb->lcd_bitmap(checkbox_full, 1, 49, 8, 6, true); 1494 rb->lcd_bitmap(checkbox_full, 1, 49, 8, 6, true);
1495 1495
1496 draw_checkbox(settings.analog_secondhand, 1, 57); 1496 draw_checkbox(settings.analog_secondhand, 1, 57);
1497 1497
1498 /* Draw line selector */ 1498 /* Draw line selector */
@@ -1521,7 +1521,7 @@ bool f3_screen(void)
1521 else 1521 else
1522 invert_analog = 1; 1522 invert_analog = 1;
1523 break; 1523 break;
1524 1524
1525 case BUTTON_LEFT: 1525 case BUTTON_LEFT:
1526 if(invert_analog == 1) 1526 if(invert_analog == 1)
1527 settings.analog_digits = false; 1527 settings.analog_digits = false;
@@ -1538,7 +1538,7 @@ bool f3_screen(void)
1538 else 1538 else
1539 settings.analog_secondhand = false; 1539 settings.analog_secondhand = false;
1540 break; 1540 break;
1541 1541
1542 case BUTTON_RIGHT: 1542 case BUTTON_RIGHT:
1543 if(invert_analog == 1) 1543 if(invert_analog == 1)
1544 settings.analog_digits = true; 1544 settings.analog_digits = true;
@@ -1594,7 +1594,7 @@ bool f3_screen(void)
1594 rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6, true); 1594 rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6, true);
1595 else 1595 else
1596 rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6, true); 1596 rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6, true);
1597 1597
1598 if(settings.digital_seconds == 0) 1598 if(settings.digital_seconds == 0)
1599 rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6, true); 1599 rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6, true);
1600 else if(settings.digital_seconds == 1) 1600 else if(settings.digital_seconds == 1)
@@ -1603,7 +1603,7 @@ bool f3_screen(void)
1603 rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6, true); 1603 rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6, true);
1604 else 1604 else
1605 rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6, true); 1605 rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6, true);
1606 1606
1607 draw_checkbox(settings.digital_blinkcolon, 1, 49); 1607 draw_checkbox(settings.digital_blinkcolon, 1, 49);
1608 draw_checkbox(settings.digital_12h, 1, 57); 1608 draw_checkbox(settings.digital_12h, 1, 57);
1609 1609
@@ -1633,7 +1633,7 @@ bool f3_screen(void)
1633 else 1633 else
1634 invert_digital++; 1634 invert_digital++;
1635 break; 1635 break;
1636 1636
1637 case BUTTON_LEFT: 1637 case BUTTON_LEFT:
1638 if(invert_digital == 1) 1638 if(invert_digital == 1)
1639 { 1639 {
@@ -1649,8 +1649,8 @@ bool f3_screen(void)
1649 settings.digital_blinkcolon = false; 1649 settings.digital_blinkcolon = false;
1650 else 1650 else
1651 settings.digital_12h = false; 1651 settings.digital_12h = false;
1652 break; 1652 break;
1653 1653
1654 case BUTTON_RIGHT: 1654 case BUTTON_RIGHT:
1655 if(invert_digital == 1) 1655 if(invert_digital == 1)
1656 { 1656 {
@@ -1666,8 +1666,8 @@ bool f3_screen(void)
1666 settings.digital_blinkcolon = true; 1666 settings.digital_blinkcolon = true;
1667 else 1667 else
1668 settings.digital_12h = true; 1668 settings.digital_12h = true;
1669 break; 1669 break;
1670 1670
1671 case BUTTON_F3: 1671 case BUTTON_F3:
1672 case BUTTON_OFF: 1672 case BUTTON_OFF:
1673 if(settings.save_mode == 2) 1673 if(settings.save_mode == 2)
@@ -1706,7 +1706,7 @@ bool f3_screen(void)
1706 rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6, true); 1706 rb->lcd_bitmap(checkbox_half, 1, 33, 8, 6, true);
1707 else 1707 else
1708 rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6, true); 1708 rb->lcd_bitmap(checkbox_full, 1, 33, 8, 6, true);
1709 1709
1710 if(settings.lcd_seconds == 0) 1710 if(settings.lcd_seconds == 0)
1711 rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6, true); 1711 rb->lcd_bitmap(checkbox_empty, 1, 41, 8, 6, true);
1712 else if(settings.lcd_seconds == 1) 1712 else if(settings.lcd_seconds == 1)
@@ -1715,7 +1715,7 @@ bool f3_screen(void)
1715 rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6, true); 1715 rb->lcd_bitmap(checkbox_twothird, 1, 41, 8, 6, true);
1716 else 1716 else
1717 rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6, true); 1717 rb->lcd_bitmap(checkbox_full, 1, 41, 8, 6, true);
1718 1718
1719 draw_checkbox(settings.lcd_blinkcolon, 1, 49); 1719 draw_checkbox(settings.lcd_blinkcolon, 1, 49);
1720 draw_checkbox(settings.lcd_12h, 1, 57); 1720 draw_checkbox(settings.lcd_12h, 1, 57);
1721 1721
@@ -1760,8 +1760,8 @@ bool f3_screen(void)
1760 settings.lcd_blinkcolon = false; 1760 settings.lcd_blinkcolon = false;
1761 else 1761 else
1762 settings.lcd_12h = false; 1762 settings.lcd_12h = false;
1763 break; 1763 break;
1764 1764
1765 case BUTTON_RIGHT: 1765 case BUTTON_RIGHT:
1766 if(invert_lcd == 1) 1766 if(invert_lcd == 1)
1767 { 1767 {
@@ -1826,7 +1826,7 @@ bool f3_screen(void)
1826 else 1826 else
1827 invert_fullscreen++; 1827 invert_fullscreen++;
1828 break; 1828 break;
1829 1829
1830 case BUTTON_LEFT: 1830 case BUTTON_LEFT:
1831 if(invert_fullscreen == 1) 1831 if(invert_fullscreen == 1)
1832 settings.fullscreen_border = false; 1832 settings.fullscreen_border = false;
@@ -1835,7 +1835,7 @@ bool f3_screen(void)
1835 else if(invert_fullscreen ==3) 1835 else if(invert_fullscreen ==3)
1836 settings.fullscreen_invertseconds = false; 1836 settings.fullscreen_invertseconds = false;
1837 break; 1837 break;
1838 1838
1839 case BUTTON_RIGHT: 1839 case BUTTON_RIGHT:
1840 if(invert_fullscreen == 1) 1840 if(invert_fullscreen == 1)
1841 settings.fullscreen_border = true; 1841 settings.fullscreen_border = true;
@@ -1953,7 +1953,7 @@ void general_settings(void)
1953 rb->lcd_bitmap(arrow, 1, 17, 8, 6, true); 1953 rb->lcd_bitmap(arrow, 1, 17, 8, 6, true);
1954 rb->lcd_bitmap(arrow, 1, 25, 8, 6, true); 1954 rb->lcd_bitmap(arrow, 1, 25, 8, 6, true);
1955 draw_checkbox(display_counter, 1, 33); 1955 draw_checkbox(display_counter, 1, 33);
1956 1956
1957 if(settings.save_mode == 1) 1957 if(settings.save_mode == 1)
1958 rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6, true); 1958 rb->lcd_bitmap(checkbox_onethird, 1, 41, 8, 6, true);
1959 else if(settings.save_mode == 2) 1959 else if(settings.save_mode == 2)
@@ -1987,7 +1987,7 @@ void general_settings(void)
1987 if(cursorpos < 4) 1987 if(cursorpos < 4)
1988 cursorpos++; 1988 cursorpos++;
1989 break; 1989 break;
1990 1990
1991 case BUTTON_LEFT: 1991 case BUTTON_LEFT:
1992 if(cursorpos == 3) 1992 if(cursorpos == 3)
1993 display_counter = false; 1993 display_counter = false;
@@ -2000,7 +2000,7 @@ void general_settings(void)
2000 } 2000 }
2001 } 2001 }
2002 break; 2002 break;
2003 2003
2004 case BUTTON_RIGHT: 2004 case BUTTON_RIGHT:
2005 if(cursorpos == 1) 2005 if(cursorpos == 1)
2006 confirm_reset(); 2006 confirm_reset();
@@ -2564,7 +2564,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
2564 TEST_PLUGIN_API(api); 2564 TEST_PLUGIN_API(api);
2565 (void)parameter; 2565 (void)parameter;
2566 rb = api; 2566 rb = api;
2567 2567
2568 /* universal font */ 2568 /* universal font */
2569 rb->lcd_setfont(FONT_SYSFIXED); 2569 rb->lcd_setfont(FONT_SYSFIXED);
2570 2570