summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/skin_engine/skin_buffer.c2
-rw-r--r--apps/gui/skin_engine/skin_display.c4
-rw-r--r--apps/gui/skin_engine/skin_tokens.c76
-rw-r--r--apps/gui/skin_engine/skin_tokens.h2
-rw-r--r--apps/gui/skin_engine/wps_debug.c26
-rw-r--r--apps/gui/statusbar.h2
6 files changed, 56 insertions, 56 deletions
diff --git a/apps/gui/skin_engine/skin_buffer.c b/apps/gui/skin_engine/skin_buffer.c
index 3ad2efc634..eb33cbe293 100644
--- a/apps/gui/skin_engine/skin_buffer.c
+++ b/apps/gui/skin_engine/skin_buffer.c
@@ -66,7 +66,7 @@
66 66
67 67
68#define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \ 68#define SKIN_BUFFER_SIZE (MAIN_BUFFER + REMOTE_BUFFER) + \
69 (WPS_MAX_TOKENS * sizeof(struct wps_token)) 69 (WPS_MAX_TOKENS * sizeof(struct wps_token))
70#endif 70#endif
71 71
72#ifdef HAVE_LCD_CHARCELLS 72#ifdef HAVE_LCD_CHARCELLS
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 79690cb715..ea2c794272 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -229,11 +229,11 @@ static void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
229#ifdef HAVE_ALBUMART 229#ifdef HAVE_ALBUMART
230 /* now draw the AA */ 230 /* now draw the AA */
231 if (data->albumart && data->albumart->vp == vp 231 if (data->albumart && data->albumart->vp == vp
232 && data->albumart->draw) 232 && data->albumart->draw)
233 { 233 {
234 draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot), 234 draw_album_art(gwps, playback_current_aa_hid(data->playback_aa_slot),
235 false); 235 false);
236 data->albumart->draw = false; 236 data->albumart->draw = false;
237 } 237 }
238#endif 238#endif
239 239
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index eff972858d..794d7f4456 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -135,16 +135,16 @@ static char* get_dir(char* buf, int buf_size, const char* path, int level)
135*/ 135*/
136static int pitch_speed_enum(int range, int32_t val, int32_t normval) 136static int pitch_speed_enum(int range, int32_t val, int32_t normval)
137{ 137{
138 int center; 138 int center;
139 int n; 139 int n;
140 140
141 if (range < 3) 141 if (range < 3)
142 return (val == normval) + 1; 142 return (val == normval) + 1;
143 if (val == normval) 143 if (val == normval)
144 return range; 144 return range;
145 center = range / 2; 145 center = range / 2;
146 n = (center * val) / normval + 1; 146 n = (center * val) / normval + 1;
147 return (range <= n) ? (range - 1) : n; 147 return (range <= n) ? (range - 1) : n;
148} 148}
149#endif 149#endif
150 150
@@ -415,8 +415,8 @@ const char *get_token_value(struct gui_wps *gwps,
415 case WPS_TOKEN_ALBUMART_DISPLAY: 415 case WPS_TOKEN_ALBUMART_DISPLAY:
416 if (!data->albumart) 416 if (!data->albumart)
417 return NULL; 417 return NULL;
418 if (!data->albumart->draw) 418 if (!data->albumart->draw)
419 data->albumart->draw = true; 419 data->albumart->draw = true;
420 return NULL; 420 return NULL;
421#endif 421#endif
422 422
@@ -549,10 +549,10 @@ const char *get_token_value(struct gui_wps *gwps,
549 } 549 }
550#endif 550#endif
551#ifdef HAVE_USB_POWER 551#ifdef HAVE_USB_POWER
552 case WPS_TOKEN_USB_POWERED: 552 case WPS_TOKEN_USB_POWERED:
553 if (usb_powered()) 553 if (usb_powered())
554 return "u"; 554 return "u";
555 return NULL; 555 return NULL;
556#endif 556#endif
557 case WPS_TOKEN_BATTERY_SLEEPTIME: 557 case WPS_TOKEN_BATTERY_SLEEPTIME:
558 { 558 {
@@ -836,32 +836,32 @@ const char *get_token_value(struct gui_wps *gwps,
836 int32_t pitch = sound_get_pitch(); 836 int32_t pitch = sound_get_pitch();
837 snprintf(buf, buf_size, "%ld.%ld", 837 snprintf(buf, buf_size, "%ld.%ld",
838 pitch / PITCH_SPEED_PRECISION, 838 pitch / PITCH_SPEED_PRECISION,
839 (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); 839 (pitch % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
840 840
841 if (intval) 841 if (intval)
842 *intval = pitch_speed_enum(limit, pitch, 842 *intval = pitch_speed_enum(limit, pitch,
843 PITCH_SPEED_PRECISION * 100); 843 PITCH_SPEED_PRECISION * 100);
844 return buf; 844 return buf;
845 } 845 }
846#endif 846#endif
847 847
848#if CONFIG_CODEC == SWCODEC 848#if CONFIG_CODEC == SWCODEC
849 case WPS_TOKEN_SOUND_SPEED: 849 case WPS_TOKEN_SOUND_SPEED:
850 { 850 {
851 int32_t pitch = sound_get_pitch(); 851 int32_t pitch = sound_get_pitch();
852 int32_t speed; 852 int32_t speed;
853 if (dsp_timestretch_available()) 853 if (dsp_timestretch_available())
854 speed = GET_SPEED(pitch, dsp_get_timestretch()); 854 speed = GET_SPEED(pitch, dsp_get_timestretch());
855 else 855 else
856 speed = pitch; 856 speed = pitch;
857 snprintf(buf, buf_size, "%ld.%ld", 857 snprintf(buf, buf_size, "%ld.%ld",
858 speed / PITCH_SPEED_PRECISION, 858 speed / PITCH_SPEED_PRECISION,
859 (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10)); 859 (speed % PITCH_SPEED_PRECISION) / (PITCH_SPEED_PRECISION / 10));
860 if (intval) 860 if (intval)
861 *intval = pitch_speed_enum(limit, speed, 861 *intval = pitch_speed_enum(limit, speed,
862 PITCH_SPEED_PRECISION * 100); 862 PITCH_SPEED_PRECISION * 100);
863 return buf; 863 return buf;
864 } 864 }
865#endif 865#endif
866 866
867 case WPS_TOKEN_MAIN_HOLD: 867 case WPS_TOKEN_MAIN_HOLD:
@@ -1122,7 +1122,7 @@ const char *get_token_value(struct gui_wps *gwps,
1122 break; 1122 break;
1123 } 1123 }
1124 #endif 1124 #endif
1125 *intval = global_settings.mp3_enc_config.bitrate+1; 1125 *intval = global_settings.mp3_enc_config.bitrate+1;
1126 } 1126 }
1127 snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1); 1127 snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1);
1128 return buf; 1128 return buf;
@@ -1136,9 +1136,9 @@ const char *get_token_value(struct gui_wps *gwps,
1136 return buf; 1136 return buf;
1137#endif 1137#endif
1138 case WPS_TOKEN_REC_MONO: 1138 case WPS_TOKEN_REC_MONO:
1139 if (!global_settings.rec_channels) 1139 if (!global_settings.rec_channels)
1140 return "m"; 1140 return "m";
1141 return NULL; 1141 return NULL;
1142 1142
1143#endif /* HAVE_RECORDING */ 1143#endif /* HAVE_RECORDING */
1144 case WPS_TOKEN_CURRENT_SCREEN: 1144 case WPS_TOKEN_CURRENT_SCREEN:
diff --git a/apps/gui/skin_engine/skin_tokens.h b/apps/gui/skin_engine/skin_tokens.h
index 68a3fde944..481078bd6d 100644
--- a/apps/gui/skin_engine/skin_tokens.h
+++ b/apps/gui/skin_engine/skin_tokens.h
@@ -226,7 +226,7 @@ struct wps_token {
226 union { 226 union {
227 char c; 227 char c;
228 unsigned short i; 228 unsigned short i;
229 void* data; 229 void* data;
230 } value; 230 } value;
231}; 231};
232 232
diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c
index 7232848005..e7277e847c 100644
--- a/apps/gui/skin_engine/wps_debug.c
+++ b/apps/gui/skin_engine/wps_debug.c
@@ -50,18 +50,18 @@ struct debug_token_table
50#define X(name) name, #name 50#define X(name) name, #name
51struct debug_token_table tokens[] = { 51struct debug_token_table tokens[] = {
52 { X(TOKEN_MARKER_CONTROL_TOKENS) }, 52 { X(TOKEN_MARKER_CONTROL_TOKENS) },
53 { X(TOKEN_MARKER_BATTERY) }, 53 { X(TOKEN_MARKER_BATTERY) },
54 { X(TOKEN_MARKER_SOUND) }, 54 { X(TOKEN_MARKER_SOUND) },
55 { X(TOKEN_MARKER_RTC) }, 55 { X(TOKEN_MARKER_RTC) },
56 { X(TOKEN_MARKER_DATABASE) }, 56 { X(TOKEN_MARKER_DATABASE) },
57 { X(TOKEN_MARKER_FILE) }, 57 { X(TOKEN_MARKER_FILE) },
58 { X(TOKEN_MARKER_IMAGES) }, 58 { X(TOKEN_MARKER_IMAGES) },
59 { X(TOKEN_MARKER_METADATA) }, 59 { X(TOKEN_MARKER_METADATA) },
60 { X(TOKEN_MARKER_PLAYBACK_INFO) }, 60 { X(TOKEN_MARKER_PLAYBACK_INFO) },
61 { X(TOKEN_MARKER_PLAYLIST) }, 61 { X(TOKEN_MARKER_PLAYLIST) },
62 { X(TOKEN_MARKER_MISC) }, 62 { X(TOKEN_MARKER_MISC) },
63 { X(TOKEN_MARKER_RECORDING) }, 63 { X(TOKEN_MARKER_RECORDING) },
64 { X(TOKEN_MARKER_END) }, 64 { X(TOKEN_MARKER_END) },
65}; 65};
66#undef X 66#undef X
67 67
@@ -499,7 +499,7 @@ static char *get_token_desc(struct wps_token *token, char *buf,
499 if (token->type < tokens[i].start_marker) 499 if (token->type < tokens[i].start_marker)
500 { 500 {
501 snprintf(buf, bufsize, "FIXME: %s + %d\n", tokens[i-1].desc, 501 snprintf(buf, bufsize, "FIXME: %s + %d\n", tokens[i-1].desc,
502 token->type - tokens[i-1].start_marker); 502 token->type - tokens[i-1].start_marker);
503 break; 503 break;
504 } 504 }
505 } 505 }
diff --git a/apps/gui/statusbar.h b/apps/gui/statusbar.h
index 28c81053e0..7c3086ed3b 100644
--- a/apps/gui/statusbar.h
+++ b/apps/gui/statusbar.h
@@ -70,7 +70,7 @@ struct gui_statusbar
70 struct status_info lastinfo; 70 struct status_info lastinfo;
71#if CONFIG_RTC 71#if CONFIG_RTC
72 struct tm *time; 72 struct tm *time;
73 int last_tm_min; 73 int last_tm_min;
74#endif 74#endif
75 struct screen * display; 75 struct screen * display;
76}; 76};