diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/lib/checkbox.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/configfile.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/fixedpoint.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/helper.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/overlay.c | 1 | ||||
-rw-r--r-- | apps/plugins/lib/playback_control.c | 9 | ||||
-rw-r--r-- | apps/plugins/lib/playback_control.h | 3 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 2 | ||||
-rw-r--r-- | apps/plugins/lib/xlcd_draw.c | 22 |
9 files changed, 23 insertions, 19 deletions
diff --git a/apps/plugins/lib/checkbox.c b/apps/plugins/lib/checkbox.c index ba3decd75d..5acc52a728 100644 --- a/apps/plugins/lib/checkbox.c +++ b/apps/plugins/lib/checkbox.c | |||
@@ -18,6 +18,7 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | #include "checkbox.h" | ||
21 | 22 | ||
22 | #ifdef HAVE_LCD_BITMAP | 23 | #ifdef HAVE_LCD_BITMAP |
23 | 24 | ||
diff --git a/apps/plugins/lib/configfile.c b/apps/plugins/lib/configfile.c index 7c7d56e4e5..b0d134fae9 100644 --- a/apps/plugins/lib/configfile.c +++ b/apps/plugins/lib/configfile.c | |||
@@ -26,7 +26,7 @@ void configfile_init(struct plugin_api* newrb) | |||
26 | cfg_rb = newrb; | 26 | cfg_rb = newrb; |
27 | } | 27 | } |
28 | 28 | ||
29 | void get_cfg_filename(char* buf, int buf_len, const char* filename) | 29 | static void get_cfg_filename(char* buf, int buf_len, const char* filename) |
30 | { | 30 | { |
31 | char *s; | 31 | char *s; |
32 | cfg_rb->strcpy(buf, cfg_rb->plugin_get_current_filename()); | 32 | cfg_rb->strcpy(buf, cfg_rb->plugin_get_current_filename()); |
diff --git a/apps/plugins/lib/fixedpoint.c b/apps/plugins/lib/fixedpoint.c index 88c2f6ea54..92979dad53 100644 --- a/apps/plugins/lib/fixedpoint.c +++ b/apps/plugins/lib/fixedpoint.c | |||
@@ -20,6 +20,7 @@ | |||
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include <inttypes.h> | 22 | #include <inttypes.h> |
23 | #include "fixedpoint.h" | ||
23 | 24 | ||
24 | /* Inverse gain of circular cordic rotation in s0.31 format. */ | 25 | /* Inverse gain of circular cordic rotation in s0.31 format. */ |
25 | static const long cordic_circular_gain = 0xb2458939; /* 0.607252929 */ | 26 | static const long cordic_circular_gain = 0xb2458939; /* 0.607252929 */ |
diff --git a/apps/plugins/lib/helper.c b/apps/plugins/lib/helper.c index 2feff14a22..3af60b5473 100644 --- a/apps/plugins/lib/helper.c +++ b/apps/plugins/lib/helper.c | |||
@@ -18,6 +18,7 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | #include "helper.h" | ||
21 | 22 | ||
22 | /* Force the backlight on */ | 23 | /* Force the backlight on */ |
23 | void backlight_force_on(struct plugin_api* rb) | 24 | void backlight_force_on(struct plugin_api* rb) |
diff --git a/apps/plugins/lib/overlay.c b/apps/plugins/lib/overlay.c index 6abde85fee..53cc4a84f0 100644 --- a/apps/plugins/lib/overlay.c +++ b/apps/plugins/lib/overlay.c | |||
@@ -21,6 +21,7 @@ | |||
21 | 21 | ||
22 | #ifndef SIMULATOR | 22 | #ifndef SIMULATOR |
23 | #include "plugin.h" | 23 | #include "plugin.h" |
24 | #include "overlay.h" | ||
24 | 25 | ||
25 | /* load and run a plugin linked as an overlay. | 26 | /* load and run a plugin linked as an overlay. |
26 | 27 | ||
diff --git a/apps/plugins/lib/playback_control.c b/apps/plugins/lib/playback_control.c index af4384ef0a..7e74728ab4 100644 --- a/apps/plugins/lib/playback_control.c +++ b/apps/plugins/lib/playback_control.c | |||
@@ -18,17 +18,18 @@ | |||
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | 19 | ||
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | #include "playback_control.h" | ||
21 | 22 | ||
22 | struct plugin_api* api = 0; | 23 | struct plugin_api* api = 0; |
23 | struct viewport *parentvp = NULL; | 24 | struct viewport *parentvp = NULL; |
24 | 25 | ||
25 | bool prevtrack(void) | 26 | static bool prevtrack(void) |
26 | { | 27 | { |
27 | api->audio_prev(); | 28 | api->audio_prev(); |
28 | return false; | 29 | return false; |
29 | } | 30 | } |
30 | 31 | ||
31 | bool play(void) | 32 | static bool play(void) |
32 | { | 33 | { |
33 | int audio_status = api->audio_status(); | 34 | int audio_status = api->audio_status(); |
34 | if (!audio_status && api->global_status->resume_index != -1) | 35 | if (!audio_status && api->global_status->resume_index != -1) |
@@ -46,13 +47,13 @@ bool play(void) | |||
46 | return false; | 47 | return false; |
47 | } | 48 | } |
48 | 49 | ||
49 | bool stop(void) | 50 | static bool stop(void) |
50 | { | 51 | { |
51 | api->audio_stop(); | 52 | api->audio_stop(); |
52 | return false; | 53 | return false; |
53 | } | 54 | } |
54 | 55 | ||
55 | bool nexttrack(void) | 56 | static bool nexttrack(void) |
56 | { | 57 | { |
57 | api->audio_next(); | 58 | api->audio_next(); |
58 | return false; | 59 | return false; |
diff --git a/apps/plugins/lib/playback_control.h b/apps/plugins/lib/playback_control.h index 49e789bbdc..a3a0d7afbc 100644 --- a/apps/plugins/lib/playback_control.h +++ b/apps/plugins/lib/playback_control.h | |||
@@ -20,12 +20,11 @@ | |||
20 | #define __PLAYBACK_CONTROL_H__ | 20 | #define __PLAYBACK_CONTROL_H__ |
21 | 21 | ||
22 | /* Use these if your menu uses the new menu api. | 22 | /* Use these if your menu uses the new menu api. |
23 | REMEBER to call playback_control_init(rb) before rb->do_menu()... | 23 | REMEMBER to call playback_control_init(rb) before rb->do_menu()... |
24 | The parent viewport here is needed by the internal functions, | 24 | The parent viewport here is needed by the internal functions, |
25 | So, make sure you use the same viewport for the rb->do_menu() call | 25 | So, make sure you use the same viewport for the rb->do_menu() call |
26 | that you use in the playback_control_init() call | 26 | that you use in the playback_control_init() call |
27 | */ | 27 | */ |
28 | extern const struct menu_item_ex playback_control_menu; | ||
29 | void playback_control_init(struct plugin_api* newapi, | 28 | void playback_control_init(struct plugin_api* newapi, |
30 | struct viewport parent[NB_SCREENS]); | 29 | struct viewport parent[NB_SCREENS]); |
31 | 30 | ||
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 99ebb51562..be78bf1408 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -456,7 +456,7 @@ static int plugin_context_count = 0; | |||
456 | static int last_context = 0; /* index into plugin_context_order | 456 | static int last_context = 0; /* index into plugin_context_order |
457 | of the last context returned */ | 457 | of the last context returned */ |
458 | 458 | ||
459 | const struct button_mapping* get_context_map(int context) | 459 | static const struct button_mapping* get_context_map(int context) |
460 | { | 460 | { |
461 | (void)context; | 461 | (void)context; |
462 | if (last_context<plugin_context_count) | 462 | if (last_context<plugin_context_count) |
diff --git a/apps/plugins/lib/xlcd_draw.c b/apps/plugins/lib/xlcd_draw.c index accf3b4f4b..506fe99877 100644 --- a/apps/plugins/lib/xlcd_draw.c +++ b/apps/plugins/lib/xlcd_draw.c | |||
@@ -26,9 +26,9 @@ | |||
26 | #include "xlcd.h" | 26 | #include "xlcd.h" |
27 | 27 | ||
28 | /* sort the given coordinates by increasing x value */ | 28 | /* sort the given coordinates by increasing x value */ |
29 | void sort_points_by_increasing_x(int* x1, int* y1, | 29 | static void sort_points_by_increasing_x(int* x1, int* y1, |
30 | int* x2, int* y2, | 30 | int* x2, int* y2, |
31 | int* x3, int* y3) | 31 | int* x3, int* y3) |
32 | { | 32 | { |
33 | int x, y; | 33 | int x, y; |
34 | if (*x1 > *x3) | 34 | if (*x1 > *x3) |
@@ -69,10 +69,10 @@ void sort_points_by_increasing_x(int* x1, int* y1, | |||
69 | sort_points_by_increasing_x(y1, x1, y2, x2, y3, x3) | 69 | sort_points_by_increasing_x(y1, x1, y2, x2, y3, x3) |
70 | 70 | ||
71 | /* draw a filled triangle, using horizontal lines for speed */ | 71 | /* draw a filled triangle, using horizontal lines for speed */ |
72 | void xlcd_filltriangle_horizontal(struct screen* display, | 72 | static void xlcd_filltriangle_horizontal(struct screen* display, |
73 | int x1, int y1, | 73 | int x1, int y1, |
74 | int x2, int y2, | 74 | int x2, int y2, |
75 | int x3, int y3) | 75 | int x3, int y3) |
76 | { | 76 | { |
77 | long fp_x1, fp_x2, fp_dx1, fp_dx2; | 77 | long fp_x1, fp_x2, fp_dx1, fp_dx2; |
78 | int y; | 78 | int y; |
@@ -109,10 +109,10 @@ void xlcd_filltriangle_horizontal(struct screen* display, | |||
109 | } | 109 | } |
110 | 110 | ||
111 | /* draw a filled triangle, using vertical lines for speed */ | 111 | /* draw a filled triangle, using vertical lines for speed */ |
112 | void xlcd_filltriangle_vertical(struct screen* display, | 112 | static void xlcd_filltriangle_vertical(struct screen* display, |
113 | int x1, int y1, | 113 | int x1, int y1, |
114 | int x2, int y2, | 114 | int x2, int y2, |
115 | int x3, int y3) | 115 | int x3, int y3) |
116 | { | 116 | { |
117 | long fp_y1, fp_y2, fp_dy1, fp_dy2; | 117 | long fp_y1, fp_y2, fp_dy1, fp_dy2; |
118 | int x; | 118 | int x; |