summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/wps.c1
-rw-r--r--apps/menus/theme_menu.c3
-rw-r--r--apps/recorder/peakmeter.c12
-rw-r--r--apps/recorder/peakmeter.h1
4 files changed, 6 insertions, 11 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 7febc567a2..4d56062c8d 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -42,7 +42,6 @@
#include "playlist.h"
#ifdef HAVE_LCD_BITMAP
#include "icons.h"
-#include "peakmeter.h"
#endif
#include "lang.h"
#include "bookmark.h"
diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c
index 078691e1a8..4aceb83291 100644
--- a/apps/menus/theme_menu.c
+++ b/apps/menus/theme_menu.c
@@ -30,9 +30,6 @@
#include "menu.h"
#include "tree.h"
#include "list.h"
-#ifdef HAVE_LCD_BITMAP
-#include "peakmeter.h"
-#endif
#include "color_picker.h"
#include "lcd.h"
#include "lcd-remote.h"
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index fd8f8d9fbe..c7f2b17d05 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -227,7 +227,7 @@ static int db_scale_count = DB_SCALE_SRC_VALUES_SIZE;
* range of -12dB to 0dB (78.0 to 90.0dB).
*/
-int calc_db (int isample)
+static int calc_db (int isample)
{
/* return n+m*(isample-istart)/100 */
int n;
@@ -243,13 +243,13 @@ int calc_db (int isample)
if (isample < 5) {
istart = 1; /* Range 1 */
n = 98;
- m = 34950;
- }
- else {
+ m = 34950;
+ }
+ else {
istart = 5; /* Range 2 */
n = 1496;
- m = 7168;
- }
+ m = 7168;
+ }
}
else {
istart = 24; /* Range 3 */
diff --git a/apps/recorder/peakmeter.h b/apps/recorder/peakmeter.h
index 6be43a5f3a..267ca20442 100644
--- a/apps/recorder/peakmeter.h
+++ b/apps/recorder/peakmeter.h
@@ -52,7 +52,6 @@ extern int peak_meter_get_min(void);
extern int peak_meter_get_max(void);
extern void peak_meter_set_use_dbfs(bool use);
extern bool peak_meter_get_use_dbfs(void);
-extern int calc_db (int isample);
extern int peak_meter_db2sample(int db);
extern unsigned short peak_meter_scale_value(unsigned short val, int meterwidth);