diff options
author | William Wilgus <wilgus.william@gmail.com> | 2021-08-18 21:30:13 -0400 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2021-08-18 21:30:13 -0400 |
commit | 0679faf65deabafc0ebd0f01f5f90c3f4bc9d065 (patch) | |
tree | da0d1f4a6d546e17454c406b5e6cdbb7cb3ca0ea | |
parent | 24e8fa317e9905ee30d195c4beedd7b8939ed6e1 (diff) | |
download | rockbox-0679faf65deabafc0ebd0f01f5f90c3f4bc9d065.tar.gz rockbox-0679faf65deabafc0ebd0f01f5f90c3f4bc9d065.zip |
lib/helper add talk_val()
talk_value_decimal() replaced talk_value()
Change-Id: Ibb7c738d6f3b399fab2e771d8ab85967e3af96d1
-rw-r--r-- | apps/plugins/announce_status.c | 7 | ||||
-rw-r--r-- | apps/plugins/lib/helper.c | 6 | ||||
-rw-r--r-- | apps/plugins/lib/helper.h | 2 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 6 |
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 @@ | |||
27 | ****************************************************************************/ | 27 | ****************************************************************************/ |
28 | 28 | ||
29 | #include "plugin.h" | 29 | #include "plugin.h" |
30 | #include "lib/helper.h" | ||
30 | #include "lib/kbd_helper.h" | 31 | #include "lib/kbd_helper.h" |
31 | #include "lib/configfile.h" | 32 | #include "lib/configfile.h" |
32 | 33 | ||
@@ -185,12 +186,6 @@ static void config_reset_voice(void) | |||
185 | } | 186 | } |
186 | 187 | ||
187 | /****************** helper fuctions ******************/ | 188 | /****************** helper fuctions ******************/ |
188 | static inline int talk_val(long n, int unit, bool enqueue) | ||
189 | { | ||
190 | #define NODECIMALS 0 | ||
191 | return rb->talk_value_decimal(n, unit, NODECIMALS, enqueue); | ||
192 | } | ||
193 | |||
194 | void announce(void) | 189 | void announce(void) |
195 | { | 190 | { |
196 | rb->talk_force_shutup(); | 191 | 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 @@ | |||
22 | #include "plugin.h" | 22 | #include "plugin.h" |
23 | #include "helper.h" | 23 | #include "helper.h" |
24 | 24 | ||
25 | int talk_val(long n, int unit, bool enqueue) | ||
26 | { | ||
27 | #define NODECIMALS 0 | ||
28 | return rb->talk_value_decimal(n, unit, NODECIMALS, enqueue); | ||
29 | } | ||
30 | |||
25 | #ifdef HAVE_BACKLIGHT | 31 | #ifdef HAVE_BACKLIGHT |
26 | /* Force the backlight on */ | 32 | /* Force the backlight on */ |
27 | void backlight_force_on(void) | 33 | 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 @@ | |||
23 | 23 | ||
24 | #include "plugin.h" | 24 | #include "plugin.h" |
25 | 25 | ||
26 | int talk_val(long n, int unit, bool enqueue); | ||
27 | |||
26 | /** | 28 | /** |
27 | * Backlight on/off operations | 29 | * Backlight on/off operations |
28 | */ | 30 | */ |
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, | |||
470 | return usb; | 470 | return usb; |
471 | } | 471 | } |
472 | 472 | ||
473 | static inline int talk_val(long n, int unit, bool enqueue) | ||
474 | { | ||
475 | #define NODECIMALS 0 | ||
476 | return rb->talk_value_decimal(n, unit, NODECIMALS, enqueue); | ||
477 | } | ||
478 | |||
479 | static int32_t backlight_brightness_getlang(int value, int unit) | 473 | static int32_t backlight_brightness_getlang(int value, int unit) |
480 | { | 474 | { |
481 | if (value < 0) | 475 | if (value < 0) |