summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Wilgus <wilgus.william@gmail.com>2021-08-18 21:30:13 -0400
committerWilliam Wilgus <wilgus.william@gmail.com>2021-08-18 21:30:13 -0400
commit0679faf65deabafc0ebd0f01f5f90c3f4bc9d065 (patch)
treeda0d1f4a6d546e17454c406b5e6cdbb7cb3ca0ea
parent24e8fa317e9905ee30d195c4beedd7b8939ed6e1 (diff)
downloadrockbox-0679faf65d.tar.gz
rockbox-0679faf65d.tar.bz2
rockbox-0679faf65d.zip
lib/helper add talk_val()
talk_value_decimal() replaced talk_value() Change-Id: Ibb7c738d6f3b399fab2e771d8ab85967e3af96d1
-rw-r--r--apps/plugins/announce_status.c7
-rw-r--r--apps/plugins/lib/helper.c6
-rw-r--r--apps/plugins/lib/helper.h2
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c6
4 files changed, 9 insertions, 12 deletions
diff --git a/apps/plugins/announce_status.c b/apps/plugins/announce_status.c
index 5a112ed6df..a9958f198d 100644
--- a/apps/plugins/announce_status.c
+++ b/apps/plugins/announce_status.c
@@ -27,6 +27,7 @@
****************************************************************************/
#include "plugin.h"
+#include "lib/helper.h"
#include "lib/kbd_helper.h"
#include "lib/configfile.h"
@@ -185,12 +186,6 @@ static void config_reset_voice(void)
}
/****************** helper fuctions ******************/
-static inline int talk_val(long n, int unit, bool enqueue)
-{
- #define NODECIMALS 0
- return rb->talk_value_decimal(n, unit, NODECIMALS, enqueue);
-}
-
void announce(void)
{
rb->talk_force_shutup();
diff --git a/apps/plugins/lib/helper.c b/apps/plugins/lib/helper.c
index f36c01b23e..018c1616c8 100644
--- a/apps/plugins/lib/helper.c
+++ b/apps/plugins/lib/helper.c
@@ -22,6 +22,12 @@
#include "plugin.h"
#include "helper.h"
+int talk_val(long n, int unit, bool enqueue)
+{
+ #define NODECIMALS 0
+ return rb->talk_value_decimal(n, unit, NODECIMALS, enqueue);
+}
+
#ifdef HAVE_BACKLIGHT
/* Force the backlight on */
void backlight_force_on(void)
diff --git a/apps/plugins/lib/helper.h b/apps/plugins/lib/helper.h
index f2e9187a96..00ad8ac087 100644
--- a/apps/plugins/lib/helper.h
+++ b/apps/plugins/lib/helper.h
@@ -23,6 +23,8 @@
#include "plugin.h"
+int talk_val(long n, int unit, bool enqueue);
+
/**
* Backlight on/off operations
*/
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 4c9fc16804..c904de466d 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -470,12 +470,6 @@ static bool mpeg_set_int(const char *string, const char *unit,
return usb;
}
-static inline int talk_val(long n, int unit, bool enqueue)
-{
- #define NODECIMALS 0
- return rb->talk_value_decimal(n, unit, NODECIMALS, enqueue);
-}
-
static int32_t backlight_brightness_getlang(int value, int unit)
{
if (value < 0)