diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/buttonbar.c | 2 | ||||
-rw-r--r-- | apps/gui/gwps-common.c | 2 | ||||
-rw-r--r-- | apps/gui/list.c | 2 | ||||
-rw-r--r-- | apps/onplay.c | 8 | ||||
-rw-r--r-- | apps/pcmbuf.c | 2 | ||||
-rw-r--r-- | apps/playback.c | 2 | ||||
-rw-r--r-- | apps/playlist_viewer.c | 49 | ||||
-rw-r--r-- | apps/recorder/backdrop.c | 18 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 2 | ||||
-rw-r--r-- | apps/recorder/peakmeter.c | 8 | ||||
-rw-r--r-- | apps/recorder/radio.c | 50 | ||||
-rw-r--r-- | apps/recorder/recording.c | 36 | ||||
-rw-r--r-- | apps/screens.c | 12 | ||||
-rw-r--r-- | apps/settings.c | 18 | ||||
-rw-r--r-- | apps/settings_menu.c | 2 | ||||
-rw-r--r-- | apps/sound_menu.c | 12 | ||||
-rw-r--r-- | apps/tagcache.c | 8 | ||||
-rw-r--r-- | apps/tagtree.c | 14 | ||||
-rw-r--r-- | apps/talk.c | 2 | ||||
-rw-r--r-- | apps/talk.h | 2 | ||||
-rw-r--r-- | apps/tree.c | 9 |
21 files changed, 135 insertions, 125 deletions
diff --git a/apps/gui/buttonbar.c b/apps/gui/buttonbar.c index b0c374d41f..b4adb45d69 100644 --- a/apps/gui/buttonbar.c +++ b/apps/gui/buttonbar.c | |||
@@ -44,7 +44,7 @@ void gui_buttonbar_set_display(struct gui_buttonbar * buttonbar, | |||
44 | buttonbar->display = display; | 44 | buttonbar->display = display; |
45 | } | 45 | } |
46 | 46 | ||
47 | void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) | 47 | static void gui_buttonbar_draw_button(struct gui_buttonbar * buttonbar, int num) |
48 | { | 48 | { |
49 | int xpos, ypos, button_width, text_width; | 49 | int xpos, ypos, button_width, text_width; |
50 | int fh; | 50 | int fh; |
diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c index 7e795ffd96..51d62d016f 100644 --- a/apps/gui/gwps-common.c +++ b/apps/gui/gwps-common.c | |||
@@ -1644,6 +1644,7 @@ static void wps_display_images(struct gui_wps *gwps, bool always) | |||
1644 | } | 1644 | } |
1645 | #endif | 1645 | #endif |
1646 | 1646 | ||
1647 | #if 0 /* currently unused */ | ||
1647 | void gui_wps_reset(struct gui_wps *gui_wps) | 1648 | void gui_wps_reset(struct gui_wps *gui_wps) |
1648 | { | 1649 | { |
1649 | if(!gui_wps || !gui_wps->data) | 1650 | if(!gui_wps || !gui_wps->data) |
@@ -1652,6 +1653,7 @@ void gui_wps_reset(struct gui_wps *gui_wps) | |||
1652 | memset(&gui_wps->data->format_buffer, 0, | 1653 | memset(&gui_wps->data->format_buffer, 0, |
1653 | sizeof(gui_wps->data->format_buffer)); | 1654 | sizeof(gui_wps->data->format_buffer)); |
1654 | } | 1655 | } |
1656 | #endif | ||
1655 | 1657 | ||
1656 | bool gui_wps_refresh(struct gui_wps *gwps, int ffwd_offset, | 1658 | bool gui_wps_refresh(struct gui_wps *gwps, int ffwd_offset, |
1657 | unsigned char refresh_mode) | 1659 | unsigned char refresh_mode) |
diff --git a/apps/gui/list.c b/apps/gui/list.c index de3e7b2b42..6d966c23ae 100644 --- a/apps/gui/list.c +++ b/apps/gui/list.c | |||
@@ -149,7 +149,7 @@ void gui_list_put_selection_in_screen(struct gui_list * gui_list, | |||
149 | } | 149 | } |
150 | 150 | ||
151 | #ifdef HAVE_LCD_BITMAP | 151 | #ifdef HAVE_LCD_BITMAP |
152 | int gui_list_get_item_offset(struct gui_list * gui_list, int item_width, | 152 | static int gui_list_get_item_offset(struct gui_list * gui_list, int item_width, |
153 | int text_pos) | 153 | int text_pos) |
154 | { | 154 | { |
155 | struct screen * display=gui_list->display; | 155 | struct screen * display=gui_list->display; |
diff --git a/apps/onplay.c b/apps/onplay.c index fa3d3954f8..af6fa9cc57 100644 --- a/apps/onplay.c +++ b/apps/onplay.c | |||
@@ -85,7 +85,7 @@ struct playlist_args { | |||
85 | /* Displays the bookmark menu options for the user to decide. This is an */ | 85 | /* Displays the bookmark menu options for the user to decide. This is an */ |
86 | /* interface function. */ | 86 | /* interface function. */ |
87 | /* ----------------------------------------------------------------------- */ | 87 | /* ----------------------------------------------------------------------- */ |
88 | bool bookmark_menu(void) | 88 | static bool bookmark_menu(void) |
89 | { | 89 | { |
90 | int i,m; | 90 | int i,m; |
91 | bool result; | 91 | bool result; |
@@ -240,13 +240,13 @@ static bool view_playlist(void) | |||
240 | return result; | 240 | return result; |
241 | } | 241 | } |
242 | 242 | ||
243 | bool cat_add_to_a_playlist(void) | 243 | static bool cat_add_to_a_playlist(void) |
244 | { | 244 | { |
245 | return catalog_add_to_a_playlist(selected_file, selected_file_attr, | 245 | return catalog_add_to_a_playlist(selected_file, selected_file_attr, |
246 | false); | 246 | false); |
247 | } | 247 | } |
248 | 248 | ||
249 | bool cat_add_to_a_new_playlist(void) | 249 | static bool cat_add_to_a_new_playlist(void) |
250 | { | 250 | { |
251 | return catalog_add_to_a_playlist(selected_file, selected_file_attr, true); | 251 | return catalog_add_to_a_playlist(selected_file, selected_file_attr, true); |
252 | } | 252 | } |
@@ -541,7 +541,7 @@ static bool rename_file(void) | |||
541 | return false; | 541 | return false; |
542 | } | 542 | } |
543 | 543 | ||
544 | bool create_dir(void) | 544 | static bool create_dir(void) |
545 | { | 545 | { |
546 | char dirname[MAX_PATH]; | 546 | char dirname[MAX_PATH]; |
547 | char *cwd; | 547 | char *cwd; |
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c index e87d27f261..f9d60e9b58 100644 --- a/apps/pcmbuf.c +++ b/apps/pcmbuf.c | |||
@@ -873,6 +873,7 @@ void pcmbuf_write_complete(size_t length) | |||
873 | } | 873 | } |
874 | } | 874 | } |
875 | 875 | ||
876 | #if 0 | ||
876 | bool pcmbuf_insert_buffer(char *buf, size_t length) | 877 | bool pcmbuf_insert_buffer(char *buf, size_t length) |
877 | { | 878 | { |
878 | if (crossfade_active) | 879 | if (crossfade_active) |
@@ -889,6 +890,7 @@ bool pcmbuf_insert_buffer(char *buf, size_t length) | |||
889 | } | 890 | } |
890 | return true; | 891 | return true; |
891 | } | 892 | } |
893 | #endif | ||
892 | 894 | ||
893 | /* Generates a constant square wave sound with a given frequency | 895 | /* Generates a constant square wave sound with a given frequency |
894 | in Hertz for a duration in milliseconds. */ | 896 | in Hertz for a duration in milliseconds. */ |
diff --git a/apps/playback.c b/apps/playback.c index 7873700247..9c81210dcc 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -3552,7 +3552,7 @@ static void audio_playback_init(void) | |||
3552 | #if MEM > 8 | 3552 | #if MEM > 8 |
3553 | /* we dont want this rebuffering on targets with little ram | 3553 | /* we dont want this rebuffering on targets with little ram |
3554 | because the disk may never spin down */ | 3554 | because the disk may never spin down */ |
3555 | bool ata_fillbuffer_callback(void) | 3555 | static bool ata_fillbuffer_callback(void) |
3556 | { | 3556 | { |
3557 | queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER_IF_ACTIVE_ATA, 0); | 3557 | queue_post(&audio_queue, Q_AUDIO_FILL_BUFFER_IF_ACTIVE_ATA, 0); |
3558 | return true; | 3558 | return true; |
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 8670f0ad46..96614d1c9a 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c | |||
@@ -108,15 +108,15 @@ static struct playlist_viewer viewer; | |||
108 | /* Used when viewing playlists on disk */ | 108 | /* Used when viewing playlists on disk */ |
109 | static struct playlist_info temp_playlist; | 109 | static struct playlist_info temp_playlist; |
110 | 110 | ||
111 | void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, | 111 | static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer, |
112 | int names_buffer_size); | 112 | int names_buffer_size); |
113 | void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, | 113 | static void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, |
114 | enum direction direction); | 114 | enum direction direction); |
115 | int playlist_entry_load(struct playlist_entry *entry, int index, | 115 | static int playlist_entry_load(struct playlist_entry *entry, int index, |
116 | char* name_buffer, int remaining_size); | 116 | char* name_buffer, int remaining_size); |
117 | 117 | ||
118 | struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer * pb, | 118 | static struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer *pb, |
119 | int index); | 119 | int index); |
120 | 120 | ||
121 | static bool playlist_viewer_init(struct playlist_viewer * viewer, | 121 | static bool playlist_viewer_init(struct playlist_viewer * viewer, |
122 | char* filename, bool reload); | 122 | char* filename, bool reload); |
@@ -133,8 +133,8 @@ static bool show_indices(void); | |||
133 | static bool track_display(void); | 133 | static bool track_display(void); |
134 | static bool save_playlist(void); | 134 | static bool save_playlist(void); |
135 | 135 | ||
136 | void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, | 136 | static void playlist_buffer_init(struct playlist_buffer *pb, char *names_buffer, |
137 | int names_buffer_size) | 137 | int names_buffer_size) |
138 | { | 138 | { |
139 | pb->name_buffer=names_buffer; | 139 | pb->name_buffer=names_buffer; |
140 | pb->buffer_size=names_buffer_size; | 140 | pb->buffer_size=names_buffer_size; |
@@ -145,8 +145,8 @@ void playlist_buffer_init(struct playlist_buffer * pb, char * names_buffer, | |||
145 | /* | 145 | /* |
146 | * Loads the entries following 'index' in the playlist buffer | 146 | * Loads the entries following 'index' in the playlist buffer |
147 | */ | 147 | */ |
148 | void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, | 148 | static void playlist_buffer_load_entries(struct playlist_buffer *pb, int index, |
149 | enum direction direction) | 149 | enum direction direction) |
150 | { | 150 | { |
151 | int num_entries = viewer.num_tracks; | 151 | int num_entries = viewer.num_tracks; |
152 | char* p = pb->name_buffer; | 152 | char* p = pb->name_buffer; |
@@ -181,8 +181,8 @@ void playlist_buffer_load_entries(struct playlist_buffer * pb, int index, | |||
181 | pb->num_loaded = i; | 181 | pb->num_loaded = i; |
182 | } | 182 | } |
183 | 183 | ||
184 | void playlist_buffer_load_entries_screen(struct playlist_buffer * pb, | 184 | static void playlist_buffer_load_entries_screen(struct playlist_buffer * pb, |
185 | enum direction direction) | 185 | enum direction direction) |
186 | { | 186 | { |
187 | if(direction==FORWARD) | 187 | if(direction==FORWARD) |
188 | { | 188 | { |
@@ -200,8 +200,8 @@ void playlist_buffer_load_entries_screen(struct playlist_buffer * pb, | |||
200 | } | 200 | } |
201 | } | 201 | } |
202 | 202 | ||
203 | int playlist_entry_load(struct playlist_entry *entry, int index, | 203 | static int playlist_entry_load(struct playlist_entry *entry, int index, |
204 | char* name_buffer, int remaining_size) | 204 | char* name_buffer, int remaining_size) |
205 | { | 205 | { |
206 | struct playlist_track_info info; | 206 | struct playlist_track_info info; |
207 | int len; | 207 | int len; |
@@ -229,7 +229,7 @@ int playlist_entry_load(struct playlist_entry *entry, int index, | |||
229 | return -1; | 229 | return -1; |
230 | } | 230 | } |
231 | 231 | ||
232 | int playlist_buffer_get_index(struct playlist_buffer * pb, int index ) | 232 | static int playlist_buffer_get_index(struct playlist_buffer *pb, int index ) |
233 | { | 233 | { |
234 | int buffer_index; | 234 | int buffer_index; |
235 | if(pb->direction==FORWARD) | 235 | if(pb->direction==FORWARD) |
@@ -252,7 +252,7 @@ int playlist_buffer_get_index(struct playlist_buffer * pb, int index ) | |||
252 | 252 | ||
253 | #define distance(a, b) \ | 253 | #define distance(a, b) \ |
254 | a>b? (a) - (b) : (b) - (a) | 254 | a>b? (a) - (b) : (b) - (a) |
255 | bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) | 255 | static bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) |
256 | { | 256 | { |
257 | if(pb->num_loaded==viewer.num_tracks) | 257 | if(pb->num_loaded==viewer.num_tracks) |
258 | return(false); | 258 | return(false); |
@@ -267,8 +267,8 @@ bool playlist_buffer_needs_reload(struct playlist_buffer* pb, int track_index) | |||
267 | return(false); | 267 | return(false); |
268 | } | 268 | } |
269 | 269 | ||
270 | struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer * pb, | 270 | static struct playlist_entry * playlist_buffer_get_track(struct playlist_buffer *pb, |
271 | int index) | 271 | int index) |
272 | { | 272 | { |
273 | int buffer_index=playlist_buffer_get_index(pb, index); | 273 | int buffer_index=playlist_buffer_get_index(pb, index); |
274 | return(&(pb->tracks[buffer_index])); | 274 | return(&(pb->tracks[buffer_index])); |
@@ -561,7 +561,7 @@ bool playlist_viewer(void) | |||
561 | return playlist_viewer_ex(NULL); | 561 | return playlist_viewer_ex(NULL); |
562 | } | 562 | } |
563 | 563 | ||
564 | char * playlist_callback_name(int selected_item, void * data, char *buffer) | 564 | static char *playlist_callback_name(int selected_item, void *data, char *buffer) |
565 | { | 565 | { |
566 | struct playlist_viewer * local_viewer = (struct playlist_viewer *)data; | 566 | struct playlist_viewer * local_viewer = (struct playlist_viewer *)data; |
567 | struct playlist_entry *track= | 567 | struct playlist_entry *track= |
@@ -571,7 +571,7 @@ char * playlist_callback_name(int selected_item, void * data, char *buffer) | |||
571 | } | 571 | } |
572 | 572 | ||
573 | 573 | ||
574 | void playlist_callback_icons(int selected_item, void * data, ICON * icon) | 574 | static void playlist_callback_icons(int selected_item, void *data, ICON * icon) |
575 | { | 575 | { |
576 | struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; | 576 | struct playlist_viewer * local_viewer=(struct playlist_viewer *)data; |
577 | struct playlist_entry *track= | 577 | struct playlist_entry *track= |
@@ -780,7 +780,8 @@ exit: | |||
780 | action_signalscreenchange(); | 780 | action_signalscreenchange(); |
781 | return ret; | 781 | return ret; |
782 | } | 782 | } |
783 | char * playlist_search_callback_name(int selected_item, void * data, char *buffer) | 783 | |
784 | static char *playlist_search_callback_name(int selected_item, void * data, char *buffer) | ||
784 | { | 785 | { |
785 | int *found_indicies = (int*)data; | 786 | int *found_indicies = (int*)data; |
786 | static struct playlist_track_info track; | 787 | static struct playlist_track_info track; |
@@ -790,7 +791,7 @@ char * playlist_search_callback_name(int selected_item, void * data, char *buffe | |||
790 | } | 791 | } |
791 | 792 | ||
792 | 793 | ||
793 | void playlist_search_callback_icons(int selected_item, void * data, ICON * icon) | 794 | static void playlist_search_callback_icons(int selected_item, void * data, ICON * icon) |
794 | { | 795 | { |
795 | (void)selected_item; | 796 | (void)selected_item; |
796 | (void)data; | 797 | (void)data; |
diff --git a/apps/recorder/backdrop.c b/apps/recorder/backdrop.c index 7779792621..e17853493d 100644 --- a/apps/recorder/backdrop.c +++ b/apps/recorder/backdrop.c | |||
@@ -23,23 +23,23 @@ | |||
23 | #include "backdrop.h" | 23 | #include "backdrop.h" |
24 | 24 | ||
25 | #if LCD_DEPTH >= 8 | 25 | #if LCD_DEPTH >= 8 |
26 | fb_data main_backdrop[LCD_HEIGHT][LCD_WIDTH]; | 26 | static fb_data main_backdrop[LCD_HEIGHT][LCD_WIDTH]; |
27 | fb_data wps_backdrop[LCD_HEIGHT][LCD_WIDTH]; | 27 | static fb_data wps_backdrop[LCD_HEIGHT][LCD_WIDTH]; |
28 | #elif LCD_DEPTH == 2 | 28 | #elif LCD_DEPTH == 2 |
29 | #if LCD_PIXELFORMAT == VERTICAL_PACKING | 29 | #if LCD_PIXELFORMAT == VERTICAL_PACKING |
30 | fb_data main_backdrop[(LCD_HEIGHT+3)/4][LCD_WIDTH]; | 30 | static fb_data main_backdrop[(LCD_HEIGHT+3)/4][LCD_WIDTH]; |
31 | fb_data wps_backdrop[(LCD_HEIGHT+3)/4][LCD_WIDTH]; | 31 | static fb_data wps_backdrop[(LCD_HEIGHT+3)/4][LCD_WIDTH]; |
32 | #else | 32 | #else |
33 | fb_data main_backdrop[LCD_HEIGHT][LCD_FBWIDTH]; | 33 | static fb_data main_backdrop[LCD_HEIGHT][LCD_FBWIDTH]; |
34 | fb_data wps_backdrop[LCD_HEIGHT][LCD_FBWIDTH]; | 34 | static fb_data wps_backdrop[LCD_HEIGHT][LCD_FBWIDTH]; |
35 | #endif | 35 | #endif |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | bool main_backdrop_valid = false; | 38 | static bool main_backdrop_valid = false; |
39 | bool wps_backdrop_valid = false; | 39 | static bool wps_backdrop_valid = false; |
40 | 40 | ||
41 | /* load a backdrop into a buffer */ | 41 | /* load a backdrop into a buffer */ |
42 | bool load_backdrop(char* filename, fb_data* backdrop_buffer) | 42 | static bool load_backdrop(char* filename, fb_data* backdrop_buffer) |
43 | { | 43 | { |
44 | struct bitmap bm; | 44 | struct bitmap bm; |
45 | int ret; | 45 | int ret; |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 58bc179b64..8e006117c8 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -90,7 +90,7 @@ struct keyboard_parameters { | |||
90 | int y; | 90 | int y; |
91 | }; | 91 | }; |
92 | 92 | ||
93 | struct keyboard_parameters param[NB_SCREENS]; | 93 | static struct keyboard_parameters param[NB_SCREENS]; |
94 | static bool kbd_loaded = false; | 94 | static bool kbd_loaded = false; |
95 | 95 | ||
96 | #ifdef KBD_MORSE_INPUT | 96 | #ifdef KBD_MORSE_INPUT |
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c index 1033ffee67..69c5e95893 100644 --- a/apps/recorder/peakmeter.c +++ b/apps/recorder/peakmeter.c | |||
@@ -50,7 +50,7 @@ static bool pm_playback = true; /* selects between playback and recording peaks | |||
50 | 50 | ||
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | struct meter_scales scales[NB_SCREENS]; | 53 | static struct meter_scales scales[NB_SCREENS]; |
54 | 54 | ||
55 | #if !defined(SIMULATOR) && CONFIG_CODEC != SWCODEC | 55 | #if !defined(SIMULATOR) && CONFIG_CODEC != SWCODEC |
56 | /* Data source */ | 56 | /* Data source */ |
@@ -84,7 +84,7 @@ unsigned short peak_meter_range_min; /* minimum of range in samples */ | |||
84 | unsigned short peak_meter_range_max; /* maximum of range in samples */ | 84 | unsigned short peak_meter_range_max; /* maximum of range in samples */ |
85 | static unsigned short pm_range; /* range width in samples */ | 85 | static unsigned short pm_range; /* range width in samples */ |
86 | static bool pm_use_dbfs = true; /* true if peakmeter displays dBfs */ | 86 | static bool pm_use_dbfs = true; /* true if peakmeter displays dBfs */ |
87 | bool level_check; /* true if peeked at peakmeter before drawing */ | 87 | static bool level_check; /* true if peeked at peakmeter before drawing */ |
88 | static unsigned short pm_db_min = 0; /* minimum of range in 1/100 dB */ | 88 | static unsigned short pm_db_min = 0; /* minimum of range in 1/100 dB */ |
89 | static unsigned short pm_db_max = 9000; /* maximum of range in 1/100 dB */ | 89 | static unsigned short pm_db_max = 9000; /* maximum of range in 1/100 dB */ |
90 | static unsigned short pm_db_range = 9000; /* range width in 1/100 dB */ | 90 | static unsigned short pm_db_range = 9000; /* range width in 1/100 dB */ |
@@ -298,7 +298,7 @@ static int db_to_sample_bin_search(int min, int max, int db) | |||
298 | * @return int - The return value is in the range of | 298 | * @return int - The return value is in the range of |
299 | * 0 <= return value < MAX_PEAK | 299 | * 0 <= return value < MAX_PEAK |
300 | */ | 300 | */ |
301 | int peak_meter_db2sample(int db) | 301 | int peak_meter_db2sample(int db) |
302 | { | 302 | { |
303 | int retval = 0; | 303 | int retval = 0; |
304 | 304 | ||
@@ -791,7 +791,7 @@ static int peak_meter_read_r(void) | |||
791 | * This is used by the histogram feature in the recording screen. | 791 | * This is used by the histogram feature in the recording screen. |
792 | * Values are in the range 0 <= peak_x < MAX_PEAK. MAX_PEAK is typ 32767. | 792 | * Values are in the range 0 <= peak_x < MAX_PEAK. MAX_PEAK is typ 32767. |
793 | */ | 793 | */ |
794 | extern void peak_meter_get_peakhold(int *peak_left, int *peak_right) | 794 | void peak_meter_get_peakhold(int *peak_left, int *peak_right) |
795 | { | 795 | { |
796 | if (peak_left) | 796 | if (peak_left) |
797 | *peak_left = pm_peakhold_left; | 797 | *peak_left = pm_peakhold_left; |
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 7a0cc6543e..51e206fc4f 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -127,13 +127,13 @@ static int preset_menu; /* The menu index of the preset list */ | |||
127 | static struct menu_item preset_menu_items[MAX_PRESETS]; | 127 | static struct menu_item preset_menu_items[MAX_PRESETS]; |
128 | static int num_presets = 0; /* The number of presets in the preset list */ | 128 | static int num_presets = 0; /* The number of presets in the preset list */ |
129 | 129 | ||
130 | void radio_save_presets(void); | 130 | static void radio_save_presets(void); |
131 | bool handle_radio_presets(void); | 131 | static bool handle_radio_presets(void); |
132 | bool radio_menu(void); | 132 | static bool radio_menu(void); |
133 | bool radio_add_preset(void); | 133 | static bool radio_add_preset(void); |
134 | bool save_preset_list(void); | 134 | static bool save_preset_list(void); |
135 | bool load_preset_list(void); | 135 | static bool load_preset_list(void); |
136 | bool clear_preset_list(void); | 136 | static bool clear_preset_list(void); |
137 | 137 | ||
138 | static bool scan_presets(void); | 138 | static bool scan_presets(void); |
139 | 139 | ||
@@ -148,14 +148,14 @@ int radio_get(int setting); | |||
148 | #define radio_set philips_set | 148 | #define radio_set philips_set |
149 | #define radio_get philips_get | 149 | #define radio_get philips_get |
150 | #elif CONFIG_TUNER == (S1A0903X01 | TEA5767) /* OndioFM */ | 150 | #elif CONFIG_TUNER == (S1A0903X01 | TEA5767) /* OndioFM */ |
151 | void (*radio_set)(int setting, int value); | 151 | static void (*radio_set)(int setting, int value); |
152 | int (*radio_get)(int setting); | 152 | static int (*radio_get)(int setting); |
153 | #endif | 153 | #endif |
154 | #endif | 154 | #endif |
155 | 155 | ||
156 | /* Function to manipulate all yesno dialogues. | 156 | /* Function to manipulate all yesno dialogues. |
157 | This function needs the output text as an argument. */ | 157 | This function needs the output text as an argument. */ |
158 | bool yesno_pop(char* text) | 158 | static bool yesno_pop(char* text) |
159 | { | 159 | { |
160 | int i; | 160 | int i; |
161 | char *lines[]={text}; | 161 | char *lines[]={text}; |
@@ -338,7 +338,7 @@ static void remember_frequency(void) | |||
338 | settings_save(); | 338 | settings_save(); |
339 | } | 339 | } |
340 | 340 | ||
341 | void next_preset(int direction) | 341 | static void next_preset(int direction) |
342 | { | 342 | { |
343 | if (num_presets < 1) | 343 | if (num_presets < 1) |
344 | return; | 344 | return; |
@@ -967,7 +967,7 @@ bool radio_screen(void) | |||
967 | return have_recorded; | 967 | return have_recorded; |
968 | } /* radio_screen */ | 968 | } /* radio_screen */ |
969 | 969 | ||
970 | void radio_save_presets(void) | 970 | static void radio_save_presets(void) |
971 | { | 971 | { |
972 | int fd; | 972 | int fd; |
973 | int i; | 973 | int i; |
@@ -1064,7 +1064,7 @@ static void rebuild_preset_menu(void) | |||
1064 | } | 1064 | } |
1065 | } | 1065 | } |
1066 | 1066 | ||
1067 | bool radio_add_preset(void) | 1067 | static bool radio_add_preset(void) |
1068 | { | 1068 | { |
1069 | char buf[MAX_FMPRESET_LEN]; | 1069 | char buf[MAX_FMPRESET_LEN]; |
1070 | 1070 | ||
@@ -1129,7 +1129,7 @@ static bool radio_edit_preset(void) | |||
1129 | return true; | 1129 | return true; |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | bool radio_delete_preset(void) | 1132 | static bool radio_delete_preset(void) |
1133 | { | 1133 | { |
1134 | int pos = menu_cursor(preset_menu); | 1134 | int pos = menu_cursor(preset_menu); |
1135 | int i; | 1135 | int i; |
@@ -1157,12 +1157,12 @@ bool radio_delete_preset(void) | |||
1157 | return true; /* Make the menu return immediately */ | 1157 | return true; /* Make the menu return immediately */ |
1158 | } | 1158 | } |
1159 | 1159 | ||
1160 | bool load_preset_list(void) | 1160 | static bool load_preset_list(void) |
1161 | { | 1161 | { |
1162 | return !rockbox_browse(FMPRESET_PATH, SHOW_FMR); | 1162 | return !rockbox_browse(FMPRESET_PATH, SHOW_FMR); |
1163 | } | 1163 | } |
1164 | 1164 | ||
1165 | bool save_preset_list(void) | 1165 | static bool save_preset_list(void) |
1166 | { | 1166 | { |
1167 | if(num_presets != 0) | 1167 | if(num_presets != 0) |
1168 | { | 1168 | { |
@@ -1215,7 +1215,7 @@ bool save_preset_list(void) | |||
1215 | return true; | 1215 | return true; |
1216 | } | 1216 | } |
1217 | 1217 | ||
1218 | bool clear_preset_list(void) | 1218 | static bool clear_preset_list(void) |
1219 | { | 1219 | { |
1220 | int i; | 1220 | int i; |
1221 | 1221 | ||
@@ -1236,7 +1236,7 @@ bool clear_preset_list(void) | |||
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | /* little menu on what to do with a preset entry */ | 1238 | /* little menu on what to do with a preset entry */ |
1239 | bool handle_radio_presets_menu(void) | 1239 | static bool handle_radio_presets_menu(void) |
1240 | { | 1240 | { |
1241 | static const struct menu_item preset_menu_items[] = { | 1241 | static const struct menu_item preset_menu_items[] = { |
1242 | { ID2P(LANG_FM_EDIT_PRESET), radio_edit_preset }, | 1242 | { ID2P(LANG_FM_EDIT_PRESET), radio_edit_preset }, |
@@ -1254,7 +1254,7 @@ bool handle_radio_presets_menu(void) | |||
1254 | } | 1254 | } |
1255 | 1255 | ||
1256 | /* button preprocessor for list of preset stations menu */ | 1256 | /* button preprocessor for list of preset stations menu */ |
1257 | int handle_radio_presets_cb(int key, int m) | 1257 | static int handle_radio_presets_cb(int key, int m) |
1258 | { | 1258 | { |
1259 | (void)m; | 1259 | (void)m; |
1260 | 1260 | ||
@@ -1292,7 +1292,7 @@ int handle_radio_presets_cb(int key, int m) | |||
1292 | } | 1292 | } |
1293 | 1293 | ||
1294 | /* present a list of preset stations */ | 1294 | /* present a list of preset stations */ |
1295 | bool handle_radio_presets(void) | 1295 | static bool handle_radio_presets(void) |
1296 | { | 1296 | { |
1297 | int result; | 1297 | int result; |
1298 | bool reload_dir = false; | 1298 | bool reload_dir = false; |
@@ -1328,7 +1328,7 @@ bool handle_radio_presets(void) | |||
1328 | return reload_dir; | 1328 | return reload_dir; |
1329 | } | 1329 | } |
1330 | 1330 | ||
1331 | char monomode_menu_string[32]; | 1331 | static char monomode_menu_string[32]; |
1332 | 1332 | ||
1333 | static void create_monomode_menu(void) | 1333 | static void create_monomode_menu(void) |
1334 | { | 1334 | { |
@@ -1347,7 +1347,7 @@ static bool toggle_mono_mode(void) | |||
1347 | return false; | 1347 | return false; |
1348 | } | 1348 | } |
1349 | 1349 | ||
1350 | char region_menu_string[32]; | 1350 | static char region_menu_string[32]; |
1351 | static void create_region_menu(void) | 1351 | static void create_region_menu(void) |
1352 | { | 1352 | { |
1353 | snprintf(region_menu_string, sizeof(region_menu_string), | 1353 | snprintf(region_menu_string, sizeof(region_menu_string), |
@@ -1381,7 +1381,7 @@ static bool toggle_region_mode(void) | |||
1381 | } | 1381 | } |
1382 | 1382 | ||
1383 | #ifndef FM_MODE | 1383 | #ifndef FM_MODE |
1384 | char radiomode_menu_string[32]; | 1384 | static char radiomode_menu_string[32]; |
1385 | 1385 | ||
1386 | static void create_radiomode_menu(void) | 1386 | static void create_radiomode_menu(void) |
1387 | { | 1387 | { |
@@ -1471,7 +1471,7 @@ static bool scan_presets(void) | |||
1471 | } | 1471 | } |
1472 | 1472 | ||
1473 | /* button preprocessor for the main menu */ | 1473 | /* button preprocessor for the main menu */ |
1474 | int radio_menu_cb(int key, int m) | 1474 | static int radio_menu_cb(int key, int m) |
1475 | { | 1475 | { |
1476 | (void)m; | 1476 | (void)m; |
1477 | #if 0 /* this screen needs fixing! */ | 1477 | #if 0 /* this screen needs fixing! */ |
@@ -1548,7 +1548,7 @@ static bool fm_recording_settings(void) | |||
1548 | 1548 | ||
1549 | 1549 | ||
1550 | /* main menu of the radio screen */ | 1550 | /* main menu of the radio screen */ |
1551 | bool radio_menu(void) | 1551 | static bool radio_menu(void) |
1552 | { | 1552 | { |
1553 | int m; | 1553 | int m; |
1554 | bool result; | 1554 | bool result; |
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index fa97837fd5..266a035632 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -73,14 +73,14 @@ | |||
73 | #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) | 73 | #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) |
74 | 74 | ||
75 | #if CONFIG_KEYPAD == RECORDER_PAD | 75 | #if CONFIG_KEYPAD == RECORDER_PAD |
76 | bool f2_rec_screen(void); | 76 | static bool f2_rec_screen(void); |
77 | bool f3_rec_screen(void); | 77 | static bool f3_rec_screen(void); |
78 | #endif | 78 | #endif |
79 | 79 | ||
80 | #define MAX_FILE_SIZE 0x7F800000 /* 2 GB - 4 MB */ | 80 | #define MAX_FILE_SIZE 0x7F800000 /* 2 GB - 4 MB */ |
81 | 81 | ||
82 | int screen_update = NB_SCREENS; | 82 | static int screen_update = NB_SCREENS; |
83 | bool remote_display_on = true; | 83 | static bool remote_display_on = true; |
84 | 84 | ||
85 | /** File name creation **/ | 85 | /** File name creation **/ |
86 | #if CONFIG_CODEC == SWCODEC | 86 | #if CONFIG_CODEC == SWCODEC |
@@ -124,7 +124,7 @@ static short balance_mem[BAL_MEM_SIZE]; | |||
124 | #define AGC_MODE_SIZE 5 | 124 | #define AGC_MODE_SIZE 5 |
125 | #define AGC_SAFETY_MODE 0 | 125 | #define AGC_SAFETY_MODE 0 |
126 | 126 | ||
127 | static char* agc_preset_str[] = | 127 | static const char* agc_preset_str[] = |
128 | { "Off", "S", "L", "D", "M", "V" }; | 128 | { "Off", "S", "L", "D", "M", "V" }; |
129 | /* "Off", | 129 | /* "Off", |
130 | "Safety (clip)", | 130 | "Safety (clip)", |
@@ -137,17 +137,17 @@ static char* agc_preset_str[] = | |||
137 | #define AGC_HIGH 27254 /* accelerated gain reduction threshold -1.6dB */ | 137 | #define AGC_HIGH 27254 /* accelerated gain reduction threshold -1.6dB */ |
138 | #define AGC_IMG 823 /* threshold for balance control -32dB */ | 138 | #define AGC_IMG 823 /* threshold for balance control -32dB */ |
139 | /* autogain high level thresholds (-3dB, -7dB, -4dB, -5dB, -5dB) */ | 139 | /* autogain high level thresholds (-3dB, -7dB, -4dB, -5dB, -5dB) */ |
140 | const short agc_th_hi[AGC_MODE_SIZE] = | 140 | static const short agc_th_hi[AGC_MODE_SIZE] = |
141 | { 23197, 14637, 21156, 18428, 18426 }; | 141 | { 23197, 14637, 21156, 18428, 18426 }; |
142 | /* autogain low level thresholds (-14dB, -11dB, -6dB, -7dB, -8dB) */ | 142 | /* autogain low level thresholds (-14dB, -11dB, -6dB, -7dB, -8dB) */ |
143 | const short agc_th_lo[AGC_MODE_SIZE] = | 143 | static const short agc_th_lo[AGC_MODE_SIZE] = |
144 | { 6538, 9235, 16422, 14636, 13045 }; | 144 | { 6538, 9235, 16422, 14636, 13045 }; |
145 | /* autogain threshold times [1/5s] or [200ms] */ | 145 | /* autogain threshold times [1/5s] or [200ms] */ |
146 | const short agc_tdrop[AGC_MODE_SIZE] = | 146 | static const short agc_tdrop[AGC_MODE_SIZE] = |
147 | { 900, 225, 150, 60, 8 }; | 147 | { 900, 225, 150, 60, 8 }; |
148 | const short agc_trise[AGC_MODE_SIZE] = | 148 | static const short agc_trise[AGC_MODE_SIZE] = |
149 | { 9000, 750, 400, 150, 20 }; | 149 | { 9000, 750, 400, 150, 20 }; |
150 | const short agc_tbal[AGC_MODE_SIZE] = | 150 | static const short agc_tbal[AGC_MODE_SIZE] = |
151 | { 4500, 500, 300, 100, 15 }; | 151 | { 4500, 500, 300, 100, 15 }; |
152 | /* AGC operation */ | 152 | /* AGC operation */ |
153 | static bool agc_enable = true; | 153 | static bool agc_enable = true; |
@@ -186,7 +186,7 @@ static void set_gain(void) | |||
186 | * Returns validity of peak values. | 186 | * Returns validity of peak values. |
187 | * Used for automatic gain control and history diagram. | 187 | * Used for automatic gain control and history diagram. |
188 | */ | 188 | */ |
189 | bool read_peak_levels(int *peak_l, int *peak_r, int *balance) | 189 | static bool read_peak_levels(int *peak_l, int *peak_r, int *balance) |
190 | { | 190 | { |
191 | peak_meter_get_peakhold(peak_l, peak_r); | 191 | peak_meter_get_peakhold(peak_l, peak_r); |
192 | peak_valid_mem[peak_time % 3] = *peak_l; | 192 | peak_valid_mem[peak_time % 3] = *peak_l; |
@@ -215,7 +215,7 @@ bool read_peak_levels(int *peak_l, int *peak_r, int *balance) | |||
215 | } | 215 | } |
216 | 216 | ||
217 | /* AGC helper function to check if maximum gain is reached */ | 217 | /* AGC helper function to check if maximum gain is reached */ |
218 | bool agc_gain_is_max(bool left, bool right) | 218 | static bool agc_gain_is_max(bool left, bool right) |
219 | { | 219 | { |
220 | /* range -128...+108 [0.5dB] */ | 220 | /* range -128...+108 [0.5dB] */ |
221 | short gain_current_l; | 221 | short gain_current_l; |
@@ -242,7 +242,7 @@ bool agc_gain_is_max(bool left, bool right) | |||
242 | (right && (gain_current_r >= agc_maxgain))); | 242 | (right && (gain_current_r >= agc_maxgain))); |
243 | } | 243 | } |
244 | 244 | ||
245 | void change_recording_gain(bool increment, bool left, bool right) | 245 | static void change_recording_gain(bool increment, bool left, bool right) |
246 | { | 246 | { |
247 | int factor = (increment ? 1 : -1); | 247 | int factor = (increment ? 1 : -1); |
248 | 248 | ||
@@ -265,7 +265,7 @@ void change_recording_gain(bool increment, bool left, bool right) | |||
265 | * Change recording gain if peak_x levels are above or below | 265 | * Change recording gain if peak_x levels are above or below |
266 | * target volume for specified timeouts. | 266 | * target volume for specified timeouts. |
267 | */ | 267 | */ |
268 | void auto_gain_control(int *peak_l, int *peak_r, int *balance) | 268 | static void auto_gain_control(int *peak_l, int *peak_r, int *balance) |
269 | { | 269 | { |
270 | int agc_mono; | 270 | int agc_mono; |
271 | short agc_mode; | 271 | short agc_mode; |
@@ -421,7 +421,7 @@ static const char* const fmtstr[] = | |||
421 | "%c%d.%02d %s " /* 2 decimals */ | 421 | "%c%d.%02d %s " /* 2 decimals */ |
422 | }; | 422 | }; |
423 | 423 | ||
424 | char *fmt_gain(int snd, int val, char *str, int len) | 424 | static char *fmt_gain(int snd, int val, char *str, int len) |
425 | { | 425 | { |
426 | int i, d, numdec; | 426 | int i, d, numdec; |
427 | const char *unit; | 427 | const char *unit; |
@@ -450,7 +450,7 @@ char *fmt_gain(int snd, int val, char *str, int len) | |||
450 | 450 | ||
451 | static int cursor; | 451 | static int cursor; |
452 | 452 | ||
453 | void adjust_cursor(void) | 453 | static void adjust_cursor(void) |
454 | { | 454 | { |
455 | int max_cursor; | 455 | int max_cursor; |
456 | 456 | ||
@@ -1776,7 +1776,7 @@ bool recording_screen(bool no_source) | |||
1776 | } /* recording_screen */ | 1776 | } /* recording_screen */ |
1777 | 1777 | ||
1778 | #if CONFIG_KEYPAD == RECORDER_PAD | 1778 | #if CONFIG_KEYPAD == RECORDER_PAD |
1779 | bool f2_rec_screen(void) | 1779 | static bool f2_rec_screen(void) |
1780 | { | 1780 | { |
1781 | static const char* const freq_str[6] = | 1781 | static const char* const freq_str[6] = |
1782 | { | 1782 | { |
@@ -1916,7 +1916,7 @@ bool f2_rec_screen(void) | |||
1916 | return false; | 1916 | return false; |
1917 | } | 1917 | } |
1918 | 1918 | ||
1919 | bool f3_rec_screen(void) | 1919 | static bool f3_rec_screen(void) |
1920 | { | 1920 | { |
1921 | bool exit = false; | 1921 | bool exit = false; |
1922 | bool used = false; | 1922 | bool used = false; |
diff --git a/apps/screens.c b/apps/screens.c index 5cc3cc15ec..ab4c5dab60 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -175,7 +175,7 @@ int mmc_remove_request(void) | |||
175 | #if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 175 | #if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
176 | 176 | ||
177 | #ifdef HAVE_LCD_BITMAP | 177 | #ifdef HAVE_LCD_BITMAP |
178 | void charging_display_info(bool animate) | 178 | static void charging_display_info(bool animate) |
179 | { | 179 | { |
180 | unsigned char charging_logo[36]; | 180 | unsigned char charging_logo[36]; |
181 | const int pox_x = (LCD_WIDTH - sizeof(charging_logo)) / 2; | 181 | const int pox_x = (LCD_WIDTH - sizeof(charging_logo)) / 2; |
@@ -280,7 +280,7 @@ static void logo_lock_patterns(bool on) | |||
280 | } | 280 | } |
281 | } | 281 | } |
282 | 282 | ||
283 | void charging_display_info(bool animate) | 283 | static void charging_display_info(bool animate) |
284 | { | 284 | { |
285 | int battv; | 285 | int battv; |
286 | unsigned i, ypos; | 286 | unsigned i, ypos; |
@@ -383,7 +383,7 @@ static int pitch_mode = PITCH_MODE_ABSOLUTE; /* 1 - absolute, -1 - semitone */ | |||
383 | 0 if no key was pressed | 383 | 0 if no key was pressed |
384 | 1 if USB was connected */ | 384 | 1 if USB was connected */ |
385 | 385 | ||
386 | void pitch_screen_draw(struct screen *display, int pitch, int pitch_mode) | 386 | static void pitch_screen_draw(struct screen *display, int pitch, int pitch_mode) |
387 | { | 387 | { |
388 | unsigned char* ptr; | 388 | unsigned char* ptr; |
389 | unsigned char buf[32]; | 389 | unsigned char buf[32]; |
@@ -631,7 +631,7 @@ bool pitch_screen(void) | |||
631 | #define int_to_bool(i)\ | 631 | #define int_to_bool(i)\ |
632 | i==0?false:true | 632 | i==0?false:true |
633 | 633 | ||
634 | void quick_screen_quick_apply(struct gui_quickscreen *qs) | 634 | static void quick_screen_quick_apply(struct gui_quickscreen *qs) |
635 | { | 635 | { |
636 | global_settings.playlist_shuffle=int_to_bool(qs->left_option->option); | 636 | global_settings.playlist_shuffle=int_to_bool(qs->left_option->option); |
637 | global_settings.dirfilter=qs->bottom_option->option; | 637 | global_settings.dirfilter=qs->bottom_option->option; |
@@ -718,7 +718,7 @@ bool quick_screen_quick(int button_enter) | |||
718 | } | 718 | } |
719 | 719 | ||
720 | #ifdef BUTTON_F3 | 720 | #ifdef BUTTON_F3 |
721 | void quick_screen_f3_apply(struct gui_quickscreen *qs) | 721 | static void quick_screen_f3_apply(struct gui_quickscreen *qs) |
722 | { | 722 | { |
723 | global_settings.scrollbar=int_to_bool(qs->left_option->option); | 723 | global_settings.scrollbar=int_to_bool(qs->left_option->option); |
724 | 724 | ||
@@ -1131,7 +1131,7 @@ bool shutdown_screen(void) | |||
1131 | #define ID3_ITEMS 11 | 1131 | #define ID3_ITEMS 11 |
1132 | #endif | 1132 | #endif |
1133 | 1133 | ||
1134 | char * id3_get_info(int selected_item, void* data, char *buffer) | 1134 | static char * id3_get_info(int selected_item, void* data, char *buffer) |
1135 | { | 1135 | { |
1136 | struct mp3entry* id3 =(struct mp3entry*)data; | 1136 | struct mp3entry* id3 =(struct mp3entry*)data; |
1137 | int info_no=selected_item/2; | 1137 | int info_no=selected_item/2; |
diff --git a/apps/settings.c b/apps/settings.c index d4359fda79..52ad72f9f3 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -762,7 +762,7 @@ static void set_bits( | |||
762 | #define hex2dec(c) (((c) >= '0' && ((c) <= '9')) ? (toupper(c)) - '0' : \ | 762 | #define hex2dec(c) (((c) >= '0' && ((c) <= '9')) ? (toupper(c)) - '0' : \ |
763 | (toupper(c)) - 'A' + 10) | 763 | (toupper(c)) - 'A' + 10) |
764 | 764 | ||
765 | int hex_to_rgb(const char* hex) | 765 | static int hex_to_rgb(const char* hex) |
766 | { int ok = 1; | 766 | { int ok = 1; |
767 | int i; | 767 | int i; |
768 | int red, green, blue; | 768 | int red, green, blue; |
@@ -821,7 +821,7 @@ static void init_config_buffer( void ) | |||
821 | config_block[3] = CONFIG_BLOCK_VERSION; | 821 | config_block[3] = CONFIG_BLOCK_VERSION; |
822 | } | 822 | } |
823 | 823 | ||
824 | bool flush_config_block_callback(void) | 824 | static bool flush_config_block_callback(void) |
825 | { | 825 | { |
826 | ata_write_sectors(IF_MV2(0,) config_sector, 1, config_block); | 826 | ata_write_sectors(IF_MV2(0,) config_sector, 1, config_block); |
827 | return true; | 827 | return true; |
@@ -1942,7 +1942,7 @@ bool set_bool(const char* string, bool* variable ) | |||
1942 | 1942 | ||
1943 | /* wrapper to convert from int param to bool param in set_option */ | 1943 | /* wrapper to convert from int param to bool param in set_option */ |
1944 | static void (*boolfunction)(bool); | 1944 | static void (*boolfunction)(bool); |
1945 | void bool_funcwrapper(int value) | 1945 | static void bool_funcwrapper(int value) |
1946 | { | 1946 | { |
1947 | if (value) | 1947 | if (value) |
1948 | boolfunction(true); | 1948 | boolfunction(true); |
@@ -1967,7 +1967,7 @@ bool set_bool_options(const char* string, bool* variable, | |||
1967 | return result; | 1967 | return result; |
1968 | } | 1968 | } |
1969 | 1969 | ||
1970 | void talk_unit(int unit, int value) | 1970 | static void talk_unit(int unit, int value) |
1971 | { | 1971 | { |
1972 | if (global_settings.talk_menu) | 1972 | if (global_settings.talk_menu) |
1973 | { | 1973 | { |
@@ -1996,7 +1996,7 @@ struct value_setting_data { | |||
1996 | struct opt_items* options; | 1996 | struct opt_items* options; |
1997 | }; | 1997 | }; |
1998 | 1998 | ||
1999 | char * value_setting_get_name_cb(int selected_item,void * data, char *buffer) | 1999 | static char * value_setting_get_name_cb(int selected_item,void * data, char *buffer) |
2000 | { | 2000 | { |
2001 | struct value_setting_data* cb_data = | 2001 | struct value_setting_data* cb_data = |
2002 | (struct value_setting_data*)data; | 2002 | (struct value_setting_data*)data; |
@@ -2016,10 +2016,10 @@ char * value_setting_get_name_cb(int selected_item,void * data, char *buffer) | |||
2016 | (int)(*(int*)(value)) \ | 2016 | (int)(*(int*)(value)) \ |
2017 | : \ | 2017 | : \ |
2018 | (bool)(*(bool*)(value)) | 2018 | (bool)(*(bool*)(value)) |
2019 | bool do_set_setting(const unsigned char* string, void *variable, | 2019 | static bool do_set_setting(const unsigned char* string, void *variable, |
2020 | int nb_items,int selected, | 2020 | int nb_items,int selected, |
2021 | struct value_setting_data *cb_data, | 2021 | struct value_setting_data *cb_data, |
2022 | void (*function)(int)) | 2022 | void (*function)(int)) |
2023 | { | 2023 | { |
2024 | int action; | 2024 | int action; |
2025 | bool done = false; | 2025 | bool done = false; |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index e49a9ec2c9..fef7592266 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -1470,7 +1470,7 @@ static bool replaygain_noclip(void) | |||
1470 | return result; | 1470 | return result; |
1471 | } | 1471 | } |
1472 | 1472 | ||
1473 | void replaygain_preamp_format(char* buffer, int buffer_size, int value, | 1473 | static void replaygain_preamp_format(char* buffer, int buffer_size, int value, |
1474 | const char* unit) | 1474 | const char* unit) |
1475 | { | 1475 | { |
1476 | int v = abs(value); | 1476 | int v = abs(value); |
diff --git a/apps/sound_menu.c b/apps/sound_menu.c index 52a6c3b34c..e0716a5e86 100644 --- a/apps/sound_menu.c +++ b/apps/sound_menu.c | |||
@@ -61,8 +61,8 @@ | |||
61 | #endif | 61 | #endif |
62 | #include "action.h" | 62 | #include "action.h" |
63 | 63 | ||
64 | int selected_setting; /* Used by the callback */ | 64 | static int selected_setting; /* Used by the callback */ |
65 | void dec_sound_formatter(char *buffer, int buffer_size, int val, const char * unit) | 65 | static void dec_sound_formatter(char *buffer, int buffer_size, int val, const char *unit) |
66 | { | 66 | { |
67 | val = sound_val2phys(selected_setting, val); | 67 | val = sound_val2phys(selected_setting, val); |
68 | char sign = ' '; | 68 | char sign = ' '; |
@@ -351,10 +351,10 @@ static bool receditable(void) | |||
351 | 351 | ||
352 | #if CONFIG_CODEC == SWCODEC | 352 | #if CONFIG_CODEC == SWCODEC |
353 | /* Makes an options list from a source list of options and indexes */ | 353 | /* Makes an options list from a source list of options and indexes */ |
354 | void make_options_from_indexes(const struct opt_items *src_names, | 354 | static void make_options_from_indexes(const struct opt_items *src_names, |
355 | const long *src_indexes, | 355 | const long *src_indexes, |
356 | int n_indexes, | 356 | int n_indexes, |
357 | struct opt_items *dst_names) | 357 | struct opt_items *dst_names) |
358 | { | 358 | { |
359 | while (--n_indexes >= 0) | 359 | while (--n_indexes >= 0) |
360 | dst_names[n_indexes] = src_names[src_indexes[n_indexes]]; | 360 | dst_names[n_indexes] = src_names[src_indexes[n_indexes]]; |
diff --git a/apps/tagcache.c b/apps/tagcache.c index 02b8430396..f6c4ad334c 100644 --- a/apps/tagcache.c +++ b/apps/tagcache.c | |||
@@ -203,7 +203,7 @@ struct tempbuf_searchidx { | |||
203 | /* Lookup buffer for fixing messed up index while after sorting. */ | 203 | /* Lookup buffer for fixing messed up index while after sorting. */ |
204 | static long commit_entry_count; | 204 | static long commit_entry_count; |
205 | static long lookup_buffer_depth; | 205 | static long lookup_buffer_depth; |
206 | struct tempbuf_searchidx **lookup; | 206 | static struct tempbuf_searchidx **lookup; |
207 | 207 | ||
208 | /* Used when building the temporary file. */ | 208 | /* Used when building the temporary file. */ |
209 | static int cachefd = -1, filenametag_fd; | 209 | static int cachefd = -1, filenametag_fd; |
@@ -773,9 +773,9 @@ static bool check_against_clause(long numeric, const char *str, | |||
773 | return false; | 773 | return false; |
774 | } | 774 | } |
775 | 775 | ||
776 | bool check_clauses(struct tagcache_search *tcs, | 776 | static bool check_clauses(struct tagcache_search *tcs, |
777 | struct index_entry *idx, | 777 | struct index_entry *idx, |
778 | struct tagcache_search_clause **clause, int count) | 778 | struct tagcache_search_clause **clause, int count) |
779 | { | 779 | { |
780 | int i; | 780 | int i; |
781 | 781 | ||
diff --git a/apps/tagtree.c b/apps/tagtree.c index 7f95f559fa..d75b9eb667 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -690,7 +690,7 @@ bool tagtree_import(void) | |||
690 | 690 | ||
691 | static bool parse_menu(const char *filename); | 691 | static bool parse_menu(const char *filename); |
692 | 692 | ||
693 | int parse_line(int n, const char *buf, void *parameters) | 693 | static int parse_line(int n, const char *buf, void *parameters) |
694 | { | 694 | { |
695 | char data[256]; | 695 | char data[256]; |
696 | int variable; | 696 | int variable; |
@@ -865,7 +865,7 @@ void tagtree_init(void) | |||
865 | audio_set_track_unbuffer_event(tagtree_unbuffer_event); | 865 | audio_set_track_unbuffer_event(tagtree_unbuffer_event); |
866 | } | 866 | } |
867 | 867 | ||
868 | bool show_search_progress(bool init, int count) | 868 | static bool show_search_progress(bool init, int count) |
869 | { | 869 | { |
870 | static int last_tick = 0; | 870 | static int last_tick = 0; |
871 | 871 | ||
@@ -893,8 +893,8 @@ bool show_search_progress(bool init, int count) | |||
893 | return true; | 893 | return true; |
894 | } | 894 | } |
895 | 895 | ||
896 | int format_str(struct tagcache_search *tcs, struct display_format *fmt, | 896 | static int format_str(struct tagcache_search *tcs, struct display_format *fmt, |
897 | char *buf, int buf_size) | 897 | char *buf, int buf_size) |
898 | { | 898 | { |
899 | char fmtbuf[8]; | 899 | char fmtbuf[8]; |
900 | bool read_format = false; | 900 | bool read_format = false; |
@@ -973,8 +973,8 @@ int format_str(struct tagcache_search *tcs, struct display_format *fmt, | |||
973 | return 0; | 973 | return 0; |
974 | } | 974 | } |
975 | 975 | ||
976 | int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | 976 | static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, |
977 | int offset, bool init) | 977 | int offset, bool init) |
978 | { | 978 | { |
979 | struct tagentry *dptr = (struct tagentry *)c->dircache; | 979 | struct tagentry *dptr = (struct tagentry *)c->dircache; |
980 | struct display_format *fmt; | 980 | struct display_format *fmt; |
@@ -1453,7 +1453,7 @@ int tagtree_get_filename(struct tree_context* c, char *buf, int buflen) | |||
1453 | return 0; | 1453 | return 0; |
1454 | } | 1454 | } |
1455 | 1455 | ||
1456 | bool insert_all_playlist(struct tree_context *c, int position, bool queue) | 1456 | static bool insert_all_playlist(struct tree_context *c, int position, bool queue) |
1457 | { | 1457 | { |
1458 | int i; | 1458 | int i; |
1459 | char buf[MAX_PATH]; | 1459 | char buf[MAX_PATH]; |
diff --git a/apps/talk.c b/apps/talk.c index a8805004d2..c22b70066e 100644 --- a/apps/talk.c +++ b/apps/talk.c | |||
@@ -542,6 +542,7 @@ void talk_init(void) | |||
542 | 542 | ||
543 | } | 543 | } |
544 | 544 | ||
545 | #if CONFIG_CODEC == SWCODEC | ||
545 | /* return if a voice codec is required or not */ | 546 | /* return if a voice codec is required or not */ |
546 | bool talk_voice_required(void) | 547 | bool talk_voice_required(void) |
547 | { | 548 | { |
@@ -549,6 +550,7 @@ bool talk_voice_required(void) | |||
549 | || (global_settings.talk_dir == 3) /* Thumbnail clips are required */ | 550 | || (global_settings.talk_dir == 3) /* Thumbnail clips are required */ |
550 | || (global_settings.talk_file == 3); | 551 | || (global_settings.talk_file == 3); |
551 | } | 552 | } |
553 | #endif | ||
552 | 554 | ||
553 | /* return size of voice file */ | 555 | /* return size of voice file */ |
554 | int talk_get_bufsize(void) | 556 | int talk_get_bufsize(void) |
diff --git a/apps/talk.h b/apps/talk.h index e863a3d25b..10e49eb301 100644 --- a/apps/talk.h +++ b/apps/talk.h | |||
@@ -60,7 +60,9 @@ extern const char* const dir_thumbnail_name; /* "_dirname.talk" */ | |||
60 | extern const char* const file_thumbnail_ext; /* ".talk" for file voicing */ | 60 | extern const char* const file_thumbnail_ext; /* ".talk" for file voicing */ |
61 | 61 | ||
62 | void talk_init(void); | 62 | void talk_init(void); |
63 | #if CONFIG_CODEC == SWCODEC | ||
63 | bool talk_voice_required(void); /* returns true if voice codec required */ | 64 | bool talk_voice_required(void); /* returns true if voice codec required */ |
65 | #endif | ||
64 | int talk_get_bufsize(void); /* get the loaded voice file size */ | 66 | int talk_get_bufsize(void); /* get the loaded voice file size */ |
65 | /* talk_buffer_steal - on SWCODEC, for use by buffer functions only */ | 67 | /* talk_buffer_steal - on SWCODEC, for use by buffer functions only */ |
66 | int talk_buffer_steal(void); /* claim the mp3 buffer e.g. for play/record */ | 68 | int talk_buffer_steal(void); /* claim the mp3 buffer e.g. for play/record */ |
diff --git a/apps/tree.c b/apps/tree.c index f0cf377041..e9ac6b5aa7 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -160,7 +160,7 @@ static int curr_context = false;/* id3db or tree*/ | |||
160 | * removes the extension of filename (if it doesn't start with a .) | 160 | * removes the extension of filename (if it doesn't start with a .) |
161 | * puts the result in buffer | 161 | * puts the result in buffer |
162 | */ | 162 | */ |
163 | char * strip_extension(char * filename, char * buffer) | 163 | static char * strip_extension(char * filename, char * buffer) |
164 | { | 164 | { |
165 | int dotpos; | 165 | int dotpos; |
166 | char * dot=strrchr(filename, '.'); | 166 | char * dot=strrchr(filename, '.'); |
@@ -174,7 +174,8 @@ char * strip_extension(char * filename, char * buffer) | |||
174 | else | 174 | else |
175 | return(filename); | 175 | return(filename); |
176 | } | 176 | } |
177 | char * tree_get_filename(int selected_item, void * data, char *buffer) | 177 | |
178 | static char * tree_get_filename(int selected_item, void * data, char *buffer) | ||
178 | { | 179 | { |
179 | struct tree_context * local_tc=(struct tree_context *)data; | 180 | struct tree_context * local_tc=(struct tree_context *)data; |
180 | char *name; | 181 | char *name; |
@@ -206,7 +207,7 @@ char * tree_get_filename(int selected_item, void * data, char *buffer) | |||
206 | } | 207 | } |
207 | 208 | ||
208 | 209 | ||
209 | void tree_get_fileicon(int selected_item, void * data, ICON * icon) | 210 | static void tree_get_fileicon(int selected_item, void * data, ICON * icon) |
210 | { | 211 | { |
211 | struct tree_context * local_tc=(struct tree_context *)data; | 212 | struct tree_context * local_tc=(struct tree_context *)data; |
212 | #ifdef HAVE_TAGCACHE | 213 | #ifdef HAVE_TAGCACHE |
@@ -290,7 +291,7 @@ struct tree_context* tree_get_context(void) | |||
290 | * Returns the position of a given file in the current directory | 291 | * Returns the position of a given file in the current directory |
291 | * returns -1 if not found | 292 | * returns -1 if not found |
292 | */ | 293 | */ |
293 | int tree_get_file_position(char * filename) | 294 | static int tree_get_file_position(char * filename) |
294 | { | 295 | { |
295 | int i; | 296 | int i; |
296 | 297 | ||