diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/screens.c | 45 | ||||
-rw-r--r-- | apps/talk.c | 4 | ||||
-rw-r--r-- | apps/wps-display.c | 26 |
3 files changed, 41 insertions, 34 deletions
diff --git a/apps/screens.c b/apps/screens.c index 3e30e3e021..1026973697 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -815,7 +815,7 @@ void charging_splash(void) | |||
815 | /* little helper function for voice output */ | 815 | /* little helper function for voice output */ |
816 | static void say_time(int cursorpos, const struct tm *tm) | 816 | static void say_time(int cursorpos, const struct tm *tm) |
817 | { | 817 | { |
818 | const int unit[] = { UNIT_HOUR, UNIT_MIN, UNIT_SEC, 0, 0, 0 }; | 818 | static const int unit[] = { UNIT_HOUR, UNIT_MIN, UNIT_SEC, 0, 0, 0 }; |
819 | int value = 0; | 819 | int value = 0; |
820 | 820 | ||
821 | if (!global_settings.talk_menu) | 821 | if (!global_settings.talk_menu) |
@@ -865,25 +865,30 @@ bool set_time_screen(const char* string, struct tm *tm) | |||
865 | unsigned int width, height; | 865 | unsigned int width, height; |
866 | unsigned int separator_width, weekday_width; | 866 | unsigned int separator_width, weekday_width; |
867 | unsigned int line_height, prev_line_height; | 867 | unsigned int line_height, prev_line_height; |
868 | const int dayname[] = {LANG_WEEKDAY_SUNDAY, | 868 | |
869 | LANG_WEEKDAY_MONDAY, | 869 | static const int dayname[] = { |
870 | LANG_WEEKDAY_TUESDAY, | 870 | LANG_WEEKDAY_SUNDAY, |
871 | LANG_WEEKDAY_WEDNESDAY, | 871 | LANG_WEEKDAY_MONDAY, |
872 | LANG_WEEKDAY_THURSDAY, | 872 | LANG_WEEKDAY_TUESDAY, |
873 | LANG_WEEKDAY_FRIDAY, | 873 | LANG_WEEKDAY_WEDNESDAY, |
874 | LANG_WEEKDAY_SATURDAY}; | 874 | LANG_WEEKDAY_THURSDAY, |
875 | const int monthname[] = {LANG_MONTH_JANUARY, | 875 | LANG_WEEKDAY_FRIDAY, |
876 | LANG_MONTH_FEBRUARY, | 876 | LANG_WEEKDAY_SATURDAY |
877 | LANG_MONTH_MARCH, | 877 | }; |
878 | LANG_MONTH_APRIL, | 878 | static const int monthname[] = { |
879 | LANG_MONTH_MAY, | 879 | LANG_MONTH_JANUARY, |
880 | LANG_MONTH_JUNE, | 880 | LANG_MONTH_FEBRUARY, |
881 | LANG_MONTH_JULY, | 881 | LANG_MONTH_MARCH, |
882 | LANG_MONTH_AUGUST, | 882 | LANG_MONTH_APRIL, |
883 | LANG_MONTH_SEPTEMBER, | 883 | LANG_MONTH_MAY, |
884 | LANG_MONTH_OCTOBER, | 884 | LANG_MONTH_JUNE, |
885 | LANG_MONTH_NOVEMBER, | 885 | LANG_MONTH_JULY, |
886 | LANG_MONTH_DECEMBER}; | 886 | LANG_MONTH_AUGUST, |
887 | LANG_MONTH_SEPTEMBER, | ||
888 | LANG_MONTH_OCTOBER, | ||
889 | LANG_MONTH_NOVEMBER, | ||
890 | LANG_MONTH_DECEMBER | ||
891 | }; | ||
887 | char cursor[][3] = {{ 0, 8, 12}, {18, 8, 12}, {36, 8, 12}, | 892 | char cursor[][3] = {{ 0, 8, 12}, {18, 8, 12}, {36, 8, 12}, |
888 | {24, 16, 24}, {54, 16, 18}, {78, 16, 12}}; | 893 | {24, 16, 24}, {54, 16, 18}, {78, 16, 12}}; |
889 | char daysinmonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; | 894 | char daysinmonth[] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}; |
diff --git a/apps/talk.c b/apps/talk.c index d90d23866e..83acbb09d5 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -486,7 +486,7 @@ int talk_number(int n, bool enqueue) | |||
486 | int talk_value(int n, int unit, bool enqueue) | 486 | int talk_value(int n, int unit, bool enqueue) |
487 | { | 487 | { |
488 | int unit_id; | 488 | int unit_id; |
489 | const int unit_voiced[] = | 489 | static const int unit_voiced[] = |
490 | { /* lookup table for the voice ID of the units */ | 490 | { /* lookup table for the voice ID of the units */ |
491 | -1, -1, -1, /* regular ID, int, signed */ | 491 | -1, -1, -1, /* regular ID, int, signed */ |
492 | VOICE_MILLISECONDS, /* here come the "real" units */ | 492 | VOICE_MILLISECONDS, /* here come the "real" units */ |
@@ -532,7 +532,7 @@ int talk_value(int n, int unit, bool enqueue) | |||
532 | } | 532 | } |
533 | 533 | ||
534 | /* spell a string */ | 534 | /* spell a string */ |
535 | int talk_spell(const char* spell, bool enqueue) | 535 | int talk_spell(const char* spell, bool enqueue) |
536 | { | 536 | { |
537 | char c; /* currently processed char */ | 537 | char c; /* currently processed char */ |
538 | 538 | ||
diff --git a/apps/wps-display.c b/apps/wps-display.c index 159f0abda6..238c8d3f19 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c | |||
@@ -1097,18 +1097,20 @@ static void draw_player_fullbar(char* buf, int buf_size, | |||
1097 | 1097 | ||
1098 | char player_progressbar[7]; | 1098 | char player_progressbar[7]; |
1099 | char binline[36]; | 1099 | char binline[36]; |
1100 | char numbers[12][4][3]={{{1,1,1},{1,0,1},{1,0,1},{1,1,1}},/*0*/ | 1100 | static const char numbers[12][4][3]={ |
1101 | {{0,1,0},{1,1,0},{0,1,0},{0,1,0}},/*1*/ | 1101 | {{1,1,1},{1,0,1},{1,0,1},{1,1,1}},/*0*/ |
1102 | {{1,1,1},{0,0,1},{0,1,0},{1,1,1}},/*2*/ | 1102 | {{0,1,0},{1,1,0},{0,1,0},{0,1,0}},/*1*/ |
1103 | {{1,1,1},{0,0,1},{0,1,1},{1,1,1}},/*3*/ | 1103 | {{1,1,1},{0,0,1},{0,1,0},{1,1,1}},/*2*/ |
1104 | {{1,0,0},{1,1,0},{1,1,1},{0,1,0}},/*4*/ | 1104 | {{1,1,1},{0,0,1},{0,1,1},{1,1,1}},/*3*/ |
1105 | {{1,1,1},{1,1,0},{0,0,1},{1,1,0}},/*5*/ | 1105 | {{1,0,0},{1,1,0},{1,1,1},{0,1,0}},/*4*/ |
1106 | {{1,1,1},{1,0,0},{1,1,1},{1,1,1}},/*6*/ | 1106 | {{1,1,1},{1,1,0},{0,0,1},{1,1,0}},/*5*/ |
1107 | {{1,1,1},{0,0,1},{0,1,0},{1,0,0}},/*7*/ | 1107 | {{1,1,1},{1,0,0},{1,1,1},{1,1,1}},/*6*/ |
1108 | {{1,1,1},{1,1,1},{1,0,1},{1,1,1}},/*8*/ | 1108 | {{1,1,1},{0,0,1},{0,1,0},{1,0,0}},/*7*/ |
1109 | {{1,1,1},{1,1,1},{0,0,1},{1,1,1}},/*9*/ | 1109 | {{1,1,1},{1,1,1},{1,0,1},{1,1,1}},/*8*/ |
1110 | {{0,0,0},{0,1,0},{0,0,0},{0,1,0}},/*:*/ | 1110 | {{1,1,1},{1,1,1},{0,0,1},{1,1,1}},/*9*/ |
1111 | {{0,0,0},{0,0,0},{0,0,0},{0,0,0}}};/*<blank>*/ | 1111 | {{0,0,0},{0,1,0},{0,0,0},{0,1,0}},/*:*/ |
1112 | {{0,0,0},{0,0,0},{0,0,0},{0,0,0}} /*<blank>*/ | ||
1113 | }; | ||
1112 | 1114 | ||
1113 | int songpos = 0; | 1115 | int songpos = 0; |
1114 | int digits[6]; | 1116 | int digits[6]; |