summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/action.c2
-rw-r--r--apps/action.h5
-rw-r--r--apps/misc.c4
-rw-r--r--apps/misc.h2
-rw-r--r--apps/plugin.h2
-rw-r--r--apps/plugins/mpegplayer/mpeg_misc.c2
6 files changed, 6 insertions, 11 deletions
diff --git a/apps/action.c b/apps/action.c
index 69089d1d8c..ee6cbaa4cf 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -368,7 +368,7 @@ static int get_action_worker(int context, int timeout,
368 368
369#if CONFIG_CODEC == SWCODEC 369#if CONFIG_CODEC == SWCODEC
370 /* Produce keyclick */ 370 /* Produce keyclick */
371 keyclick_click(0, ret); 371 keyclick_click(false, ret);
372#endif 372#endif
373 373
374 return ret; 374 return ret;
diff --git a/apps/action.h b/apps/action.h
index 1bffed3b75..e46e4a64b2 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -42,11 +42,6 @@
42#define ALLOW_SOFTLOCK 0 42#define ALLOW_SOFTLOCK 0
43#endif 43#endif
44 44
45#define CONTEXT_RAWBUTTON 0x04000000 /* For passing raw button code to
46 functions that normally take
47 action codes
48 (ie. keyclick_click) */
49
50enum { 45enum {
51 CONTEXT_STD = 0, 46 CONTEXT_STD = 0,
52 /* These CONTEXT_ values were here before me, 47 /* These CONTEXT_ values were here before me,
diff --git a/apps/misc.c b/apps/misc.c
index 78ee154c56..ca99a1d9ac 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -887,13 +887,13 @@ void keyclick_set_callback(keyclick_callback cb, void* data)
887} 887}
888 888
889/* Produce keyclick based upon button and global settings */ 889/* Produce keyclick based upon button and global settings */
890void keyclick_click(int context, int action) 890void keyclick_click(bool rawbutton, int action)
891{ 891{
892 int button = action; 892 int button = action;
893 static long last_button = BUTTON_NONE; 893 static long last_button = BUTTON_NONE;
894 bool do_beep = false; 894 bool do_beep = false;
895 895
896 if (!(context & CONTEXT_RAWBUTTON)) 896 if (!rawbutton)
897 get_action_statuscode(&button); 897 get_action_statuscode(&button);
898 898
899 /* Settings filters */ 899 /* Settings filters */
diff --git a/apps/misc.h b/apps/misc.h
index 4ae7c19a32..8d0953985d 100644
--- a/apps/misc.h
+++ b/apps/misc.h
@@ -148,7 +148,7 @@ void system_sound_play(enum system_sound sound);
148typedef bool (*keyclick_callback)(int action, void* data); 148typedef bool (*keyclick_callback)(int action, void* data);
149void keyclick_set_callback(keyclick_callback cb, void* data); 149void keyclick_set_callback(keyclick_callback cb, void* data);
150/* Produce keyclick based upon button and global settings */ 150/* Produce keyclick based upon button and global settings */
151void keyclick_click(int context, int action); 151void keyclick_click(bool rawbutton, int action);
152#endif /* CONFIG_CODEC == SWCODEC */ 152#endif /* CONFIG_CODEC == SWCODEC */
153 153
154void push_current_activity(enum current_activity screen); 154void push_current_activity(enum current_activity screen);
diff --git a/apps/plugin.h b/apps/plugin.h
index bddf23b5d2..cd2440abdc 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -705,7 +705,7 @@ struct plugin_api {
705 size_t (*mixer_channel_get_bytes_waiting)(enum pcm_mixer_channel channel); 705 size_t (*mixer_channel_get_bytes_waiting)(enum pcm_mixer_channel channel);
706 706
707 void (*system_sound_play)(enum system_sound sound); 707 void (*system_sound_play)(enum system_sound sound);
708 void (*keyclick_click)(int context, int action); 708 void (*keyclick_click)(bool rawbutton, int action);
709#endif /* CONFIG_CODEC == SWCODC */ 709#endif /* CONFIG_CODEC == SWCODC */
710 710
711 /* playback control */ 711 /* playback control */
diff --git a/apps/plugins/mpegplayer/mpeg_misc.c b/apps/plugins/mpegplayer/mpeg_misc.c
index cbaca70646..fc7fb87fd6 100644
--- a/apps/plugins/mpegplayer/mpeg_misc.c
+++ b/apps/plugins/mpegplayer/mpeg_misc.c
@@ -216,7 +216,7 @@ int mpeg_button_get(int timeout)
216 rb->button_get_w_tmo(timeout); 216 rb->button_get_w_tmo(timeout);
217 217
218 /* Produce keyclick */ 218 /* Produce keyclick */
219 rb->keyclick_click(CONTEXT_RAWBUTTON, button); 219 rb->keyclick_click(true, button);
220 220
221 return mpeg_sysevent_callback(button, NULL); 221 return mpeg_sysevent_callback(button, NULL);
222} 222}