diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2008-05-03 08:35:14 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2008-05-03 08:35:14 +0000 |
commit | e15f8a21a971920558a6f463586b16a0ee49ad79 (patch) | |
tree | 91d6771d0979c43e5390dc1de0ba79cd0638ba25 /apps | |
parent | 9c1ab1f0572da9d68f45fc8cb6c361cee0b33376 (diff) | |
download | rockbox-e15f8a21a971920558a6f463586b16a0ee49ad79.tar.gz rockbox-e15f8a21a971920558a6f463586b16a0ee49ad79.zip |
Made source files #include the header file that they implement to make sure they are in sync. Made some local functions static.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/dsp.c | 4 | ||||
-rw-r--r-- | apps/gui/color_picker.c | 1 | ||||
-rw-r--r-- | apps/gui/gwps-common.c | 2 | ||||
-rw-r--r-- | apps/gui/list.c | 1 | ||||
-rw-r--r-- | apps/gui/splash.c | 9 | ||||
-rw-r--r-- | apps/menu.c | 2 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 10 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 1 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 1 | ||||
-rw-r--r-- | apps/recorder/radio.c | 3 | ||||
-rw-r--r-- | apps/recorder/recording.c | 2 | ||||
-rw-r--r-- | apps/root_menu.c | 2 | ||||
-rw-r--r-- | apps/tagcache.c | 2 | ||||
-rw-r--r-- | apps/tagcache.h | 3 |
14 files changed, 27 insertions, 16 deletions
diff --git a/apps/dsp.c b/apps/dsp.c index 5b90b7c543..7eee7bab48 100644 --- a/apps/dsp.c +++ b/apps/dsp.c | |||
@@ -927,7 +927,7 @@ void dsp_set_eq(bool enable) | |||
927 | set_gain(&audio_dsp); | 927 | set_gain(&audio_dsp); |
928 | } | 928 | } |
929 | 929 | ||
930 | void dsp_set_stereo_width(int value) | 930 | static void dsp_set_stereo_width(int value) |
931 | { | 931 | { |
932 | long width, straight, cross; | 932 | long width, straight, cross; |
933 | 933 | ||
@@ -1023,7 +1023,7 @@ static void channels_process_sound_chan_karaoke(int count, int32_t *buf[]) | |||
1023 | } | 1023 | } |
1024 | #endif /* DSP_HAVE_ASM_SOUND_CHAN_KARAOKE */ | 1024 | #endif /* DSP_HAVE_ASM_SOUND_CHAN_KARAOKE */ |
1025 | 1025 | ||
1026 | void dsp_set_channel_config(int value) | 1026 | static void dsp_set_channel_config(int value) |
1027 | { | 1027 | { |
1028 | static const channels_process_fn_type channels_process_functions[] = | 1028 | static const channels_process_fn_type channels_process_functions[] = |
1029 | { | 1029 | { |
diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c index b883349620..a788cbade2 100644 --- a/apps/gui/color_picker.c +++ b/apps/gui/color_picker.c | |||
@@ -32,6 +32,7 @@ | |||
32 | #include "splash.h" | 32 | #include "splash.h" |
33 | #include "action.h" | 33 | #include "action.h" |
34 | #include "icon.h" | 34 | #include "icon.h" |
35 | #include "color_picker.h" | ||
35 | 36 | ||
36 | /* structure for color info */ | 37 | /* structure for color info */ |
37 | struct rgb_pick | 38 | struct rgb_pick |
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 9582a48dc4..ed4ca17b2a 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -64,7 +64,7 @@ | |||
64 | 64 | ||
65 | /* draws the statusbar on the given wps-screen */ | 65 | /* draws the statusbar on the given wps-screen */ |
66 | #ifdef HAVE_LCD_BITMAP | 66 | #ifdef HAVE_LCD_BITMAP |
67 | void gui_wps_statusbar_draw(struct gui_wps *wps, bool force) | 67 | static void gui_wps_statusbar_draw(struct gui_wps *wps, bool force) |
68 | { | 68 | { |
69 | bool draw = global_settings.statusbar; | 69 | bool draw = global_settings.statusbar; |
70 | 70 | ||
diff --git a/apps/gui/list.c b/apps/gui/list.c index 2c849660d6..6b4229545d 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include "misc.h" | 38 | #include "misc.h" |
39 | #include "talk.h" | 39 | #include "talk.h" |
40 | #include "viewport.h" | 40 | #include "viewport.h" |
41 | #include "list.h" | ||
41 | 42 | ||
42 | #ifdef HAVE_LCD_CHARCELLS | 43 | #ifdef HAVE_LCD_CHARCELLS |
43 | #define SCROLL_LIMIT 1 | 44 | #define SCROLL_LIMIT 1 |
diff --git a/apps/gui/splash.c b/apps/gui/splash.c index c690777cc6..df0446e62d 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include "lang.h" | 25 | #include "lang.h" |
26 | #include "settings.h" | 26 | #include "settings.h" |
27 | #include "talk.h" | 27 | #include "talk.h" |
28 | #include "splash.h" | ||
28 | 29 | ||
29 | #ifndef MAX | 30 | #ifndef MAX |
30 | #define MAX(a, b) (((a)>(b))?(a):(b)) | 31 | #define MAX(a, b) (((a)>(b))?(a):(b)) |
@@ -185,7 +186,7 @@ static void splash(struct screen * screen, const char *fmt, va_list ap) | |||
185 | } | 186 | } |
186 | 187 | ||
187 | void gui_splash(struct screen * screen, int ticks, | 188 | void gui_splash(struct screen * screen, int ticks, |
188 | const unsigned char *fmt, ...) | 189 | const char *fmt, ...) |
189 | { | 190 | { |
190 | va_list ap; | 191 | va_list ap; |
191 | va_start( ap, fmt ); | 192 | va_start( ap, fmt ); |
@@ -196,21 +197,21 @@ void gui_splash(struct screen * screen, int ticks, | |||
196 | sleep(ticks); | 197 | sleep(ticks); |
197 | } | 198 | } |
198 | 199 | ||
199 | void gui_syncsplash(int ticks, const unsigned char *fmt, ...) | 200 | void gui_syncsplash(int ticks, const char *fmt, ...) |
200 | { | 201 | { |
201 | va_list ap; | 202 | va_list ap; |
202 | int i; | 203 | int i; |
203 | #if !defined(SIMULATOR) || CONFIG_CODEC == SWCODEC | 204 | #if !defined(SIMULATOR) || CONFIG_CODEC == SWCODEC |
204 | long id; | 205 | long id; |
205 | /* fmt may be a so called virtual pointer. See settings.h. */ | 206 | /* fmt may be a so called virtual pointer. See settings.h. */ |
206 | if((id = P2ID(fmt)) >= 0) | 207 | if((id = P2ID((unsigned char *)fmt)) >= 0) |
207 | /* If fmt specifies a voicefont ID, and voice menus are | 208 | /* If fmt specifies a voicefont ID, and voice menus are |
208 | enabled, then speak it. */ | 209 | enabled, then speak it. */ |
209 | cond_talk_ids_fq(id); | 210 | cond_talk_ids_fq(id); |
210 | #endif | 211 | #endif |
211 | /* If fmt is a lang ID then get the corresponding string (which | 212 | /* If fmt is a lang ID then get the corresponding string (which |
212 | still might contain % place holders). */ | 213 | still might contain % place holders). */ |
213 | fmt = P2STR(fmt); | 214 | fmt = P2STR((unsigned char *)fmt); |
214 | va_start( ap, fmt ); | 215 | va_start( ap, fmt ); |
215 | FOR_NB_SCREENS(i) | 216 | FOR_NB_SCREENS(i) |
216 | splash(&(screens[i]), fmt, ap); | 217 | splash(&(screens[i]), fmt, ap); |
diff --git a/apps/menu.c b/apps/menu.c index f61acd076b..e1998ea2f7 100644 --- a/apps/menu.c +++ b/apps/menu.c | |||
@@ -282,7 +282,7 @@ static int talk_menu_item(int selected_item, void *data) | |||
282 | } | 282 | } |
283 | /* this is used to reload the default menu viewports when the | 283 | /* this is used to reload the default menu viewports when the |
284 | theme changes. nothing happens if the menu is using a supplied parent vp */ | 284 | theme changes. nothing happens if the menu is using a supplied parent vp */ |
285 | void init_default_menu_viewports(struct viewport parent[NB_SCREENS], bool hide_bars) | 285 | static void init_default_menu_viewports(struct viewport parent[NB_SCREENS], bool hide_bars) |
286 | { | 286 | { |
287 | int i; | 287 | int i; |
288 | FOR_NB_SCREENS(i) | 288 | FOR_NB_SCREENS(i) |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index d593e9b8f3..3bcf5f08e4 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "backdrop.h" | 37 | #include "backdrop.h" |
38 | 38 | ||
39 | #ifdef HAVE_BACKLIGHT | 39 | #ifdef HAVE_BACKLIGHT |
40 | int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item) | 40 | static int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item) |
41 | { | 41 | { |
42 | (void)this_item; | 42 | (void)this_item; |
43 | switch (action) | 43 | switch (action) |
@@ -55,7 +55,7 @@ int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item | |||
55 | } | 55 | } |
56 | #endif | 56 | #endif |
57 | #ifdef HAVE_LCD_BITMAP | 57 | #ifdef HAVE_LCD_BITMAP |
58 | int flipdisplay_callback(int action,const struct menu_item_ex *this_item) | 58 | static int flipdisplay_callback(int action,const struct menu_item_ex *this_item) |
59 | { | 59 | { |
60 | (void)this_item; | 60 | (void)this_item; |
61 | switch (action) | 61 | switch (action) |
@@ -251,7 +251,7 @@ MENUITEM_SETTING(list_accel_start_delay, | |||
251 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); | 251 | MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); |
252 | #endif /* HAVE_SCROLLWHEEL */ | 252 | #endif /* HAVE_SCROLLWHEEL */ |
253 | #ifdef HAVE_LCD_BITMAP | 253 | #ifdef HAVE_LCD_BITMAP |
254 | int screenscroll_callback(int action,const struct menu_item_ex *this_item) | 254 | static int screenscroll_callback(int action,const struct menu_item_ex *this_item) |
255 | { | 255 | { |
256 | (void)this_item; | 256 | (void)this_item; |
257 | switch (action) | 257 | switch (action) |
@@ -294,7 +294,7 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, | |||
294 | /***********************************/ | 294 | /***********************************/ |
295 | /* BARS MENU */ | 295 | /* BARS MENU */ |
296 | #ifdef HAVE_LCD_BITMAP | 296 | #ifdef HAVE_LCD_BITMAP |
297 | int statusbar_callback(int action,const struct menu_item_ex *this_item) | 297 | static int statusbar_callback(int action,const struct menu_item_ex *this_item) |
298 | { | 298 | { |
299 | (void)this_item; | 299 | (void)this_item; |
300 | switch (action) | 300 | switch (action) |
@@ -328,7 +328,7 @@ MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, | |||
328 | /* PEAK METER MENU */ | 328 | /* PEAK METER MENU */ |
329 | 329 | ||
330 | #ifdef HAVE_LCD_BITMAP | 330 | #ifdef HAVE_LCD_BITMAP |
331 | int peakmeter_callback(int action,const struct menu_item_ex *this_item) | 331 | static int peakmeter_callback(int action,const struct menu_item_ex *this_item) |
332 | { | 332 | { |
333 | (void)this_item; | 333 | (void)this_item; |
334 | switch (action) | 334 | switch (action) |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index aa16adffd1..887d89a4c3 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -62,6 +62,7 @@ | |||
62 | #endif | 62 | #endif |
63 | #include "action.h" | 63 | #include "action.h" |
64 | #include "recording.h" | 64 | #include "recording.h" |
65 | #include "sound_menu.h" | ||
65 | 66 | ||
66 | 67 | ||
67 | static bool no_source_in_menu = false; | 68 | static bool no_source_in_menu = false; |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 6788db8452..ae7666f788 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include "icon.h" | 34 | #include "icon.h" |
35 | #include "pcmbuf.h" | 35 | #include "pcmbuf.h" |
36 | #include "lang.h" | 36 | #include "lang.h" |
37 | #include "keyboard.h" | ||
37 | 38 | ||
38 | #ifndef O_BINARY | 39 | #ifndef O_BINARY |
39 | #define O_BINARY 0 | 40 | #define O_BINARY 0 |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 3a15d4f721..f4b643de94 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1278,7 +1278,8 @@ MENUITEM_FUNCTION(radio_edit_preset_item, MENU_FUNC_CHECK_RETVAL, | |||
1278 | MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, | 1278 | MENUITEM_FUNCTION(radio_delete_preset_item, MENU_FUNC_CHECK_RETVAL, |
1279 | ID2P(LANG_FM_DELETE_PRESET), | 1279 | ID2P(LANG_FM_DELETE_PRESET), |
1280 | radio_delete_preset, NULL, NULL, Icon_NOICON); | 1280 | radio_delete_preset, NULL, NULL, Icon_NOICON); |
1281 | int radio_preset_callback(int action, const struct menu_item_ex *this_item) | 1281 | static int radio_preset_callback(int action, |
1282 | const struct menu_item_ex *this_item) | ||
1282 | { | 1283 | { |
1283 | if (action == ACTION_STD_OK) | 1284 | if (action == ACTION_STD_OK) |
1284 | action = ACTION_EXIT_AFTER_THIS_MENUITEM; | 1285 | action = ACTION_EXIT_AFTER_THIS_MENUITEM; |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 4c8da8c3bd..6a2b9257d4 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -66,6 +66,8 @@ | |||
66 | #include "screen_access.h" | 66 | #include "screen_access.h" |
67 | #include "action.h" | 67 | #include "action.h" |
68 | #include "radio.h" | 68 | #include "radio.h" |
69 | #include "sound_menu.h" | ||
70 | |||
69 | #ifdef HAVE_RECORDING | 71 | #ifdef HAVE_RECORDING |
70 | /* This array holds the record timer interval lengths, in seconds */ | 72 | /* This array holds the record timer interval lengths, in seconds */ |
71 | static const unsigned long rec_timer_seconds[] = | 73 | static const unsigned long rec_timer_seconds[] = |
diff --git a/apps/root_menu.c b/apps/root_menu.c index 378b776b81..cb9d7769eb 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -354,7 +354,7 @@ MENUITEM_RETURNVALUE(db_browser, ID2P(LANG_TAGCACHE), GO_TO_DBBROWSER, | |||
354 | #endif | 354 | #endif |
355 | MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS, | 355 | MENUITEM_RETURNVALUE(rocks_browser, ID2P(LANG_PLUGINS), GO_TO_BROWSEPLUGINS, |
356 | NULL, Icon_Plugin); | 356 | NULL, Icon_Plugin); |
357 | char *get_wps_item_name(int selected_item, void * data, char *buffer) | 357 | static char *get_wps_item_name(int selected_item, void * data, char *buffer) |
358 | { | 358 | { |
359 | (void)selected_item; (void)data; (void)buffer; | 359 | (void)selected_item; (void)data; (void)buffer; |
360 | if (audio_status()) | 360 | if (audio_status()) |
diff --git a/apps/tagcache.c b/apps/tagcache.c index 8cf261f93f..68b894f9ff 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -73,6 +73,8 @@ | |||
73 | #include "settings.h" | 73 | #include "settings.h" |
74 | #include "dir.h" | 74 | #include "dir.h" |
75 | #include "structec.h" | 75 | #include "structec.h" |
76 | #include "tagcache.h" | ||
77 | |||
76 | #ifndef __PCTOOL__ | 78 | #ifndef __PCTOOL__ |
77 | #include "splash.h" | 79 | #include "splash.h" |
78 | #include "lang.h" | 80 | #include "lang.h" |
diff --git a/apps/tagcache.h b/apps/tagcache.h index 51b063d7ff..143062a95f 100644 --- a/apps/tagcache.h +++ b/apps/tagcache.h | |||
@@ -169,8 +169,9 @@ struct tagcache_search { | |||
169 | int idx_id; | 169 | int idx_id; |
170 | }; | 170 | }; |
171 | 171 | ||
172 | #ifdef __PCTOOL__ | ||
173 | void build_tagcache(const char *path); | 172 | void build_tagcache(const char *path); |
173 | |||
174 | #ifdef __PCTOOL__ | ||
174 | void tagcache_reverse_scan(void); | 175 | void tagcache_reverse_scan(void); |
175 | #endif | 176 | #endif |
176 | 177 | ||