summaryrefslogtreecommitdiff
path: root/apps/gui
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui')
-rw-r--r--apps/gui/bitmap/list.c1
-rw-r--r--apps/gui/charcell/list.c1
-rw-r--r--apps/gui/list.c2
-rw-r--r--apps/gui/option_select.c3
-rw-r--r--apps/gui/pitchscreen.c15
-rw-r--r--apps/gui/skin_engine/skin_backdrops.c3
-rw-r--r--apps/gui/skin_engine/skin_display.c2
-rw-r--r--apps/gui/skin_engine/skin_tokens.c14
-rw-r--r--apps/gui/statusbar.c2
-rw-r--r--apps/gui/usb_screen.c1
-rw-r--r--apps/gui/viewport.c1
-rw-r--r--apps/gui/wps.c1
12 files changed, 19 insertions, 27 deletions
diff --git a/apps/gui/bitmap/list.c b/apps/gui/bitmap/list.c
index 10616c9..0da67c7 100644
--- a/apps/gui/bitmap/list.c
+++ b/apps/gui/bitmap/list.c
@@ -25,7 +25,6 @@
#include "lcd.h"
#include "font.h"
#include "button.h"
-#include "sprintf.h"
#include "string.h"
#include "settings.h"
#include "kernel.h"
diff --git a/apps/gui/charcell/list.c b/apps/gui/charcell/list.c
index f36d3c9..8eebfe7 100644
--- a/apps/gui/charcell/list.c
+++ b/apps/gui/charcell/list.c
@@ -25,7 +25,6 @@
#include "lcd.h"
#include "font.h"
#include "button.h"
-#include "sprintf.h"
#include "string.h"
#include "settings.h"
#include "kernel.h"
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 11a4c36..de76310 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -19,11 +19,11 @@
*
****************************************************************************/
+#include <stdarg.h>
#include "config.h"
#include "lcd.h"
#include "font.h"
#include "button.h"
-#include "sprintf.h"
#include "string.h"
#include "settings.h"
#include "kernel.h"
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 71a28cb..feed1dc 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -20,10 +20,9 @@
*
****************************************************************************/
#include <stdlib.h>
-#include <string.h>
+#include "string-extra.h"
#include "config.h"
#include "option_select.h"
-#include "sprintf.h"
#include "kernel.h"
#include "lang.h"
#include "talk.h"
diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c
index 77b5739..a005872 100644
--- a/apps/gui/pitchscreen.c
+++ b/apps/gui/pitchscreen.c
@@ -23,9 +23,8 @@
#include <string.h>
#include <stdio.h>
#include <math.h>
-#include <stdlib.h> /* for ABS() */
+#include <stdlib.h> /* for abs() */
#include "config.h"
-#include "sprintf.h"
#include "action.h"
#include "dsp.h"
#include "sound.h"
@@ -248,10 +247,10 @@ static void pitchscreen_draw(struct screen *display, int max_lines,
/* Pitch:XXX.X% */
if(global_settings.pitch_mode_semitone)
{
- snprintf(buf, sizeof(buf), "%s: %s%ld.%02ld", str(LANG_PITCH),
+ snprintf(buf, sizeof(buf), "%s: %s%d.%02d", str(LANG_PITCH),
semitone >= 0 ? "+" : "-",
- ABS(semitone / PITCH_SPEED_PRECISION),
- ABS((semitone % PITCH_SPEED_PRECISION) /
+ abs(semitone / PITCH_SPEED_PRECISION),
+ abs((semitone % PITCH_SPEED_PRECISION) /
(PITCH_SPEED_PRECISION / 100))
);
}
@@ -290,10 +289,10 @@ static void pitchscreen_draw(struct screen *display, int max_lines,
{
if(global_settings.pitch_mode_semitone)
{
- snprintf(buf, sizeof(buf), "%s%ld.%02ld",
+ snprintf(buf, sizeof(buf), "%s%d.%02d",
semitone >= 0 ? "+" : "-",
- ABS(semitone / PITCH_SPEED_PRECISION),
- ABS((semitone % PITCH_SPEED_PRECISION) /
+ abs(semitone / PITCH_SPEED_PRECISION),
+ abs((semitone % PITCH_SPEED_PRECISION) /
(PITCH_SPEED_PRECISION / 100))
);
}
diff --git a/apps/gui/skin_engine/skin_backdrops.c b/apps/gui/skin_engine/skin_backdrops.c
index fd786a7..77de8bd 100644
--- a/apps/gui/skin_engine/skin_backdrops.c
+++ b/apps/gui/skin_engine/skin_backdrops.c
@@ -21,9 +21,8 @@
#include "config.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
-
+#include "string-extra.h"
#include "settings.h"
#include "skin_buffer.h"
#include "wps_internals.h"
diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index 0d7824a..d3169be 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -21,7 +21,7 @@
****************************************************************************/
#include "config.h"
#include <stdio.h>
-#include <string.h>
+#include "string-extra.h"
#include "misc.h"
#include "font.h"
#include "system.h"
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 4ee8c74..6e5a2ea 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -21,7 +21,7 @@
****************************************************************************/
#include "font.h"
#include <stdio.h>
-#include <string.h>
+#include "string-extra.h"
#include <stdlib.h>
#include "action.h"
#include "system.h"
@@ -247,7 +247,7 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
{
*intval = limit * elapsed / length + 1;
}
- snprintf(buf, buf_size, "%d", 100 * elapsed / length);
+ snprintf(buf, buf_size, "%lu", 100 * elapsed / length);
return buf;
@@ -269,7 +269,7 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
if ((id3->frequency % 1000) < 100)
snprintf(buf, buf_size, "%ld", id3->frequency / 1000);
else
- snprintf(buf, buf_size, "%ld.%d",
+ snprintf(buf, buf_size, "%ld.%lu",
id3->frequency / 1000,
(id3->frequency % 1000) / 100);
return buf;
@@ -302,12 +302,12 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
case WPS_TOKEN_DATABASE_RATING:
if (intval)
*intval = id3->rating + 1;
- snprintf(buf, buf_size, "%ld", id3->rating);
+ snprintf(buf, buf_size, "%d", id3->rating);
return buf;
case WPS_TOKEN_DATABASE_AUTOSCORE:
if (intval)
*intval = id3->score + 1;
- snprintf(buf, buf_size, "%ld", id3->score);
+ snprintf(buf, buf_size, "%d", id3->score);
return buf;
#endif
@@ -1064,7 +1064,7 @@ const char *get_token_value(struct gui_wps *gwps,
break;)
}
}
- snprintf(buf, buf_size, "%d.%1d", samprk/1000,samprk%1000);
+ snprintf(buf, buf_size, "%lu.%1lu", samprk/1000,samprk%1000);
#else /* HWCODEC */
static const char * const freq_strings[] =
@@ -1164,7 +1164,7 @@ const char *get_token_value(struct gui_wps *gwps,
#endif
*intval = global_settings.mp3_enc_config.bitrate+1;
}
- snprintf(buf, buf_size, "%d", global_settings.mp3_enc_config.bitrate+1);
+ snprintf(buf, buf_size, "%lu", global_settings.mp3_enc_config.bitrate+1);
return buf;
}
else
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c
index bc5570e..901615d 100644
--- a/apps/gui/statusbar.c
+++ b/apps/gui/statusbar.c
@@ -19,11 +19,11 @@
*
****************************************************************************/
+#include <stdio.h>
#include "config.h"
#include "font.h"
#include "kernel.h"
#include "string.h" /* for memcmp oO*/
-#include "sprintf.h"
#include "sound.h"
#include "settings.h"
#include "viewport.h"
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index 019aec6..9895def 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -30,7 +30,6 @@
#include "usb_core.h"
#ifdef USB_ENABLE_HID
#include "usb_keymaps.h"
-#include "sprintf.h"
#endif
#endif
#include "settings.h"
diff --git a/apps/gui/viewport.c b/apps/gui/viewport.c
index 03f004b..7d12818 100644
--- a/apps/gui/viewport.c
+++ b/apps/gui/viewport.c
@@ -41,7 +41,6 @@
/* all below isn't needed for pc tools (i.e. checkwps/wps editor)
* only viewport_parse_viewport() is */
#ifndef __PCTOOL__
-#include "sprintf.h"
#include "string.h"
#include "kernel.h"
#include "system.h"
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index afd7f3f..916ca2c 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -31,7 +31,6 @@
#include "action.h"
#include "kernel.h"
#include "filetypes.h"
-#include "sprintf.h"
#include "settings.h"
#include "skin_engine/skin_engine.h"
#include "mp3_playback.h"
generated by cgit v1.1 at 2026-04-25 08:12:49 +0000