diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2011-10-04 21:25:26 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2011-10-04 21:25:26 +0000 |
commit | 2e58d5935ddb19e0712d7a1c1b59db4665f724f5 (patch) | |
tree | c06aa481498649e4c599f3b8df393ec07a0d29f4 | |
parent | 9bddc48b32f95f6279ffaa88a11c05db7534b1a1 (diff) | |
download | rockbox-2e58d5935ddb19e0712d7a1c1b59db4665f724f5.tar.gz rockbox-2e58d5935ddb19e0712d7a1c1b59db4665f724f5.zip |
Make function calc_db in peakmeter.c static
Remove some unneeded #include "peakmeter.h"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30713 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/gui/wps.c | 1 | ||||
-rw-r--r-- | apps/menus/theme_menu.c | 3 | ||||
-rw-r--r-- | apps/recorder/peakmeter.c | 12 | ||||
-rw-r--r-- | apps/recorder/peakmeter.h | 1 |
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 @@ | |||
42 | #include "playlist.h" | 42 | #include "playlist.h" |
43 | #ifdef HAVE_LCD_BITMAP | 43 | #ifdef HAVE_LCD_BITMAP |
44 | #include "icons.h" | 44 | #include "icons.h" |
45 | #include "peakmeter.h" | ||
46 | #endif | 45 | #endif |
47 | #include "lang.h" | 46 | #include "lang.h" |
48 | #include "bookmark.h" | 47 | #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 @@ | |||
30 | #include "menu.h" | 30 | #include "menu.h" |
31 | #include "tree.h" | 31 | #include "tree.h" |
32 | #include "list.h" | 32 | #include "list.h" |
33 | #ifdef HAVE_LCD_BITMAP | ||
34 | #include "peakmeter.h" | ||
35 | #endif | ||
36 | #include "color_picker.h" | 33 | #include "color_picker.h" |
37 | #include "lcd.h" | 34 | #include "lcd.h" |
38 | #include "lcd-remote.h" | 35 | #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; | |||
227 | * range of -12dB to 0dB (78.0 to 90.0dB). | 227 | * range of -12dB to 0dB (78.0 to 90.0dB). |
228 | */ | 228 | */ |
229 | 229 | ||
230 | int calc_db (int isample) | 230 | static int calc_db (int isample) |
231 | { | 231 | { |
232 | /* return n+m*(isample-istart)/100 */ | 232 | /* return n+m*(isample-istart)/100 */ |
233 | int n; | 233 | int n; |
@@ -243,13 +243,13 @@ int calc_db (int isample) | |||
243 | if (isample < 5) { | 243 | if (isample < 5) { |
244 | istart = 1; /* Range 1 */ | 244 | istart = 1; /* Range 1 */ |
245 | n = 98; | 245 | n = 98; |
246 | m = 34950; | 246 | m = 34950; |
247 | } | 247 | } |
248 | else { | 248 | else { |
249 | istart = 5; /* Range 2 */ | 249 | istart = 5; /* Range 2 */ |
250 | n = 1496; | 250 | n = 1496; |
251 | m = 7168; | 251 | m = 7168; |
252 | } | 252 | } |
253 | } | 253 | } |
254 | else { | 254 | else { |
255 | istart = 24; /* Range 3 */ | 255 | 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); | |||
52 | extern int peak_meter_get_max(void); | 52 | extern int peak_meter_get_max(void); |
53 | extern void peak_meter_set_use_dbfs(bool use); | 53 | extern void peak_meter_set_use_dbfs(bool use); |
54 | extern bool peak_meter_get_use_dbfs(void); | 54 | extern bool peak_meter_get_use_dbfs(void); |
55 | extern int calc_db (int isample); | ||
56 | extern int peak_meter_db2sample(int db); | 55 | extern int peak_meter_db2sample(int db); |
57 | extern unsigned short peak_meter_scale_value(unsigned short val, int meterwidth); | 56 | extern unsigned short peak_meter_scale_value(unsigned short val, int meterwidth); |
58 | 57 | ||