devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Add support multimedia keys/buttons to the core, and adapt Rockbox on android for it (multimedia buttons are found on wired headsets and the lock screen in cyanogenmod).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28421 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-10-31 15:32:57 +00:00
parent dbe2ac1ec6
commit 49f1ec8e8a
13 changed files with 300 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/export/button.h
View file

@ -69,6 +69,21 @@ int button_apply_acceleration(const unsigned int data);
#define BUTTON_REL 0x02000000
#define BUTTON_REPEAT 0x04000000
#define BUTTON_TOUCHSCREEN 0x08000000
#define BUTTON_MULTIMEDIA 0x10000000
#define BUTTON_MULTIMEDIA_PLAYPAUSE (BUTTON_MULTIMEDIA|0x01)
#define BUTTON_MULTIMEDIA_STOP (BUTTON_MULTIMEDIA|0x02)
#define BUTTON_MULTIMEDIA_PREV (BUTTON_MULTIMEDIA|0x04)
#define BUTTON_MULTIMEDIA_NEXT (BUTTON_MULTIMEDIA|0x08)
#define BUTTON_MULTIMEDIA_REW (BUTTON_MULTIMEDIA|0x10)
#define BUTTON_MULTIMEDIA_FFWD (BUTTON_MULTIMEDIA|0x20)
#define BUTTON_MULTIMEDIA_ALL (BUTTON_MULTIMEDIA_PLAYPAUSE| \
BUTTON_MULTIMEDIA_STOP| \
BUTTON_MULTIMEDIA_PREV| \
BUTTON_MULTIMEDIA_NEXT| \
BUTTON_MULTIMEDIA_REW | \
BUTTON_MULTIMEDIA_FFWD)
#ifdef HAVE_TOUCHSCREEN
int touchscreen_last_touch(void);

1
firmware/export/config/application.h
View file

@ -77,6 +77,7 @@
#if (CONFIG_PLATFORM & PLATFORM_ANDROID)
#define CONFIG_KEYPAD ANDROID_PAD
#define HAVE_MULTIMEDIA_KEYS
#elif (CONFIG_PLATFORM & PLATFORM_SDL)
#define HAVE_SCROLLWHEEL
#define CONFIG_KEYPAD SDL_PAD

21
firmware/target/hosted/android/app/button-application.c
View file

@ -45,3 +45,24 @@ int key_to_button(int keyboard_key)
return BUTTON_MENU;
}
}
unsigned multimedia_to_button(int keyboard_key)
{
switch (keyboard_key)
{
case KEYCODE_MEDIA_PLAY_PAUSE:
return BUTTON_MULTIMEDIA_PLAYPAUSE;
case KEYCODE_MEDIA_STOP:
return BUTTON_MULTIMEDIA_STOP;
case KEYCODE_MEDIA_NEXT:
return BUTTON_MULTIMEDIA_NEXT;
case KEYCODE_MEDIA_PREVIOUS:
return BUTTON_MULTIMEDIA_PREV;
case KEYCODE_MEDIA_REWIND:
return BUTTON_MULTIMEDIA_REW;
case KEYCODE_MEDIA_FAST_FORWARD:
return BUTTON_MULTIMEDIA_FFWD;
default:
return 0;
}
}

1
firmware/target/hosted/android/app/button-target.h
View file

@ -28,6 +28,7 @@
#undef button_init_device
void button_init_device(void);
int button_read_device(int *data);
unsigned multimedia_to_button(int keyboard_key);
/* Main unit's buttons */
#define BUTTON_MENU 0x00000001

19
firmware/target/hosted/android/button-android.c
View file

@ -28,7 +28,7 @@
#include "kernel.h"
#include "system.h"
#include "touchscreen.h"
#include "debug.h"
static int last_y, last_x;
static int last_btns;
static long last_button_tick;
@ -44,7 +44,7 @@ static enum {
* began or stopped the touch action + where (pixel coordinates) */
JNIEXPORT void JNICALL
Java_org_rockbox_RockboxFramebuffer_touchHandler(JNIEnv*env, jobject this,
bool down, int x, int y)
jboolean down, jint x, jint y)
{
(void)env;
(void)this;
@ -63,12 +63,23 @@ Java_org_rockbox_RockboxFramebuffer_touchHandler(JNIEnv*env, jobject this,
* generated by pressing/releasing them to a variable */
JNIEXPORT bool JNICALL
Java_org_rockbox_RockboxFramebuffer_buttonHandler(JNIEnv*env, jobject this,
int keycode, bool state)
jint keycode, jboolean state)
{
(void)env;
(void)this;
int button = key_to_button(keycode);
unsigned button = 0;
if (!state)
button = multimedia_to_button((int)keycode);
if (button)
{ /* multimeida buttons are handled differently */
queue_post(&button_queue, button, 0);
return true;
}
button = key_to_button(keycode);
if (button == BUTTON_NONE)
return false;