diff options
author | Thomas Martitz <kugel@rockbox.org> | 2009-07-22 22:10:25 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2009-07-22 22:10:25 +0000 |
commit | 5c9fe52629f2f0f68e25efe658281b2fa42bab84 (patch) | |
tree | b0823e6b48173a84dc5dfc84ada7295ebbbd7d38 | |
parent | 962faf12732b8e62dd2930c42e00111fc5d4f7ed (diff) | |
download | rockbox-5c9fe52629f2f0f68e25efe658281b2fa42bab84.tar.gz rockbox-5c9fe52629f2f0f68e25efe658281b2fa42bab84.zip |
Commit part of FS#9873 - Utilise buttons for playlisting
It adds a shortcut (combo or button) to directly go from the wps to the playlist viewer. The combos could possibly be improved on some targets, but I tried to keep a tad bit of consistency (was hardly possible).
I also added a corresponding touchscreen region and adapted cabbiev2.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22003 a1c6a512-1295-4272-9138-f99709370657
34 files changed, 54 insertions, 15 deletions
diff --git a/apps/action.h b/apps/action.h index dd81d13818..eae5f1249b 100644 --- a/apps/action.h +++ b/apps/action.h | |||
@@ -120,6 +120,7 @@ enum { | |||
120 | ACTION_WPS_CONTEXT, | 120 | ACTION_WPS_CONTEXT, |
121 | ACTION_WPS_QUICKSCREEN,/* optional */ | 121 | ACTION_WPS_QUICKSCREEN,/* optional */ |
122 | ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */ | 122 | ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */ |
123 | ACTION_WPS_VIEW_PLAYLIST, | ||
123 | ACTION_WPS_REC, | 124 | ACTION_WPS_REC, |
124 | #if 0 | 125 | #if 0 |
125 | ACTION_WPSAB_SINGLE, /* This needs to be #defined in | 126 | ACTION_WPSAB_SINGLE, /* This needs to be #defined in |
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c index eb1437c910..154864a280 100644 --- a/apps/gui/gwps.c +++ b/apps/gui/gwps.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include "pcmbuf.h" | 65 | #include "pcmbuf.h" |
66 | #include "option_select.h" | 66 | #include "option_select.h" |
67 | #include "dsp.h" | 67 | #include "dsp.h" |
68 | #include "playlist_viewer.h" | ||
68 | 69 | ||
69 | #define RESTORE_WPS_INSTANTLY 0l | 70 | #define RESTORE_WPS_INSTANTLY 0l |
70 | #define RESTORE_WPS_NEXT_SECOND ((long)(HZ+current_tick)) | 71 | #define RESTORE_WPS_NEXT_SECOND ((long)(HZ+current_tick)) |
@@ -786,7 +787,12 @@ long gui_wps_show(void) | |||
786 | case SYS_POWEROFF: | 787 | case SYS_POWEROFF: |
787 | default_event_handler(SYS_POWEROFF); | 788 | default_event_handler(SYS_POWEROFF); |
788 | break; | 789 | break; |
789 | 790 | case ACTION_WPS_VIEW_PLAYLIST: | |
791 | gwps_leave_wps(); | ||
792 | if (playlist_viewer()) /* true if USB connected */ | ||
793 | return SYS_USB_CONNECTED; | ||
794 | restore = true; | ||
795 | break; | ||
790 | default: | 796 | default: |
791 | if(default_event_handler(button) == SYS_USB_CONNECTED) | 797 | if(default_event_handler(button) == SYS_USB_CONNECTED) |
792 | return GO_TO_ROOT; | 798 | return GO_TO_ROOT; |
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h index ac1cbad60b..2acde0dc39 100644 --- a/apps/gui/gwps.h +++ b/apps/gui/gwps.h | |||
@@ -378,7 +378,7 @@ struct touchregion { | |||
378 | bool repeat; /* requires the area be held for the action */ | 378 | bool repeat; /* requires the area be held for the action */ |
379 | int action; /* action this button will return */ | 379 | int action; /* action this button will return */ |
380 | }; | 380 | }; |
381 | #define MAX_TOUCHREGIONS 12 | 381 | #define MAX_TOUCHREGIONS 15 |
382 | #endif | 382 | #endif |
383 | /* wps_data | 383 | /* wps_data |
384 | this struct holds all necessary data which describes the | 384 | this struct holds all necessary data which describes the |
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index 248269ddcb..fb0b3ac4c6 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -1163,6 +1163,7 @@ static struct touchaction touchactions[] = { | |||
1163 | {"menu", ACTION_WPS_MENU }, {"browse", ACTION_WPS_BROWSE }, | 1163 | {"menu", ACTION_WPS_MENU }, {"browse", ACTION_WPS_BROWSE }, |
1164 | {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE }, | 1164 | {"shuffle", ACTION_TOUCH_SHUFFLE }, {"repmode", ACTION_TOUCH_REPMODE }, |
1165 | {"quickscreen", ACTION_WPS_QUICKSCREEN },{"contextmenu", ACTION_WPS_CONTEXT }, | 1165 | {"quickscreen", ACTION_WPS_QUICKSCREEN },{"contextmenu", ACTION_WPS_CONTEXT }, |
1166 | {"playlist", ACTION_WPS_VIEW_PLAYLIST }, | ||
1166 | }; | 1167 | }; |
1167 | static int parse_touchregion(const char *wps_bufptr, | 1168 | static int parse_touchregion(const char *wps_bufptr, |
1168 | struct wps_token *token, struct wps_data *wps_data) | 1169 | struct wps_token *token, struct wps_data *wps_data) |
@@ -1191,6 +1192,7 @@ static int parse_touchregion(const char *wps_bufptr, | |||
1191 | * contextmenu - open the context menu | 1192 | * contextmenu - open the context menu |
1192 | */ | 1193 | */ |
1193 | 1194 | ||
1195 | |||
1194 | if ((wps_data->touchregion_count +1 >= MAX_TOUCHREGIONS) || (*ptr != '|')) | 1196 | if ((wps_data->touchregion_count +1 >= MAX_TOUCHREGIONS) || (*ptr != '|')) |
1195 | return WPS_ERROR_INVALID_PARAM; | 1197 | return WPS_ERROR_INVALID_PARAM; |
1196 | ptr++; | 1198 | ptr++; |
diff --git a/apps/keymaps/keymap-av300.c b/apps/keymaps/keymap-av300.c index 1cca2c2a8b..15fc561f62 100644 --- a/apps/keymaps/keymap-av300.c +++ b/apps/keymaps/keymap-av300.c | |||
@@ -74,7 +74,8 @@ static const struct button_mapping button_context_wps[] = { | |||
74 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 74 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
75 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, | 75 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, |
76 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, | 76 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT,BUTTON_SELECT }, |
77 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2, BUTTON_NONE }, | 77 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, |
78 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_F2|BUTTON_REL, BUTTON_F2 }, | ||
78 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 79 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
79 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, | 80 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, |
80 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, | 81 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, |
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c index 80948c0e19..e40a2df61e 100644 --- a/apps/keymaps/keymap-c100.c +++ b/apps/keymaps/keymap-c100.c | |||
@@ -69,6 +69,7 @@ static const struct button_mapping button_context_wps[] = { | |||
69 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, | 69 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, |
70 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, | 70 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, |
71 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 71 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
72 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
72 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 73 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
73 | 74 | ||
74 | LAST_ITEM_IN_LIST | 75 | LAST_ITEM_IN_LIST |
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c index bddfa9b1d5..36345ee4fb 100644 --- a/apps/keymaps/keymap-c200.c +++ b/apps/keymaps/keymap-c200.c | |||
@@ -81,6 +81,7 @@ static const struct button_mapping button_context_wps[] = { | |||
81 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 81 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
82 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN, BUTTON_NONE }, | 82 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN, BUTTON_NONE }, |
83 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 83 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
84 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
84 | 85 | ||
85 | LAST_ITEM_IN_LIST | 86 | LAST_ITEM_IN_LIST |
86 | }; /* button_context_wps */ | 87 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 592e0b4a9a..7956bbd324 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -80,8 +80,9 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, | 80 | { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
81 | { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 81 | { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
82 | 82 | ||
83 | { ACTION_WPS_PITCHSCREEN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 83 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
84 | { ACTION_WPS_ID3SCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 84 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
85 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
85 | 86 | ||
86 | LAST_ITEM_IN_LIST | 87 | LAST_ITEM_IN_LIST |
87 | }; /* button_context_wps */ | 88 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-creativezv.c b/apps/keymaps/keymap-creativezv.c index c66d19c5fa..6004eb2cd2 100644 --- a/apps/keymaps/keymap-creativezv.c +++ b/apps/keymaps/keymap-creativezv.c | |||
@@ -92,7 +92,7 @@ static const struct button_mapping button_context_wps[] = { | |||
92 | 92 | ||
93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
95 | { ACTION_WPS_MENU, BUTTON_POWER, BUTTON_NONE }, | 95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, |
96 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 96 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
97 | 97 | ||
98 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 98 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-creativezvm.c b/apps/keymaps/keymap-creativezvm.c index 4b0618e15d..8d190f4262 100644 --- a/apps/keymaps/keymap-creativezvm.c +++ b/apps/keymaps/keymap-creativezvm.c | |||
@@ -91,7 +91,7 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | 91 | ||
92 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 92 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
93 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 93 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_POWER, BUTTON_NONE }, | 94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER, BUTTON_NONE }, |
95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 95 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
96 | 96 | ||
97 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | 97 | { ACTION_WPS_ID3SCREEN, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index 569862827d..4d5ac65171 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -80,6 +80,7 @@ static const struct button_mapping button_context_wps[] = { | |||
80 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 80 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
81 | 81 | ||
82 | { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 82 | { ACTION_WPS_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
83 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
83 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 84 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
84 | 85 | ||
85 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 86 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c index 783446429f..b64549b1ba 100644 --- a/apps/keymaps/keymap-fuze.c +++ b/apps/keymaps/keymap-fuze.c | |||
@@ -83,6 +83,7 @@ static const struct button_mapping button_context_wps[] = { | |||
83 | 83 | ||
84 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, | 84 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, |
85 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 85 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
86 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | ||
86 | 87 | ||
87 | LAST_ITEM_IN_LIST | 88 | LAST_ITEM_IN_LIST |
88 | }; /* button_context_wps */ | 89 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index 19d27ee136..5c13bc0efc 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c | |||
@@ -100,7 +100,7 @@ static const struct button_mapping button_context_wps[] = { | |||
100 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 100 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
101 | 101 | ||
102 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, | 102 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_UP, BUTTON_BACK }, |
103 | { ACTION_WPS_PITCHSCREEN, BUTTON_BACK|BUTTON_DOWN, BUTTON_BACK }, | 103 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, |
104 | 104 | ||
105 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 105 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
106 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 106 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c index 3e5f404c71..dbaac6fc49 100644 --- a/apps/keymaps/keymap-gigabeat.c +++ b/apps/keymaps/keymap-gigabeat.c | |||
@@ -93,7 +93,7 @@ static const struct button_mapping button_context_wps[] = { | |||
93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
94 | 94 | ||
95 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, | 95 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_UP, BUTTON_A }, |
96 | { ACTION_WPS_PITCHSCREEN, BUTTON_A|BUTTON_DOWN, BUTTON_A }, | 96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_A|BUTTON_DOWN, BUTTON_NONE }, |
97 | 97 | ||
98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index ff6c66d629..7fef53d55b 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -87,6 +87,7 @@ static const struct button_mapping button_context_wps[] = { | |||
87 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 87 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
88 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 88 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
89 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 89 | { ACTION_WPS_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
90 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_POWER|BUTTON_PLAY, BUTTON_NONE }, | ||
90 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 91 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, |
91 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | 92 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, |
92 | 93 | ||
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index cd18bf0041..10139d6356 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -91,7 +91,8 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 91 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
92 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, | 92 | { ACTION_WPS_ABRESET, BUTTON_ON|BUTTON_SELECT, BUTTON_ON }, |
93 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, | 93 | { ACTION_WPS_ID3SCREEN, BUTTON_ON|BUTTON_MODE, BUTTON_NONE }, |
94 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 94 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
95 | 96 | ||
96 | LAST_ITEM_IN_LIST | 97 | LAST_ITEM_IN_LIST |
97 | }; /* button_context_wps */ | 98 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c index 86a6a58797..1d1866b4a3 100644 --- a/apps/keymaps/keymap-hdd1630.c +++ b/apps/keymaps/keymap-hdd1630.c | |||
@@ -93,7 +93,7 @@ static const struct button_mapping button_context_wps[] = { | |||
93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 93 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
94 | 94 | ||
95 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, | 95 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_UP, BUTTON_VIEW }, |
96 | { ACTION_WPS_PITCHSCREEN, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, | 96 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_VIEW|BUTTON_DOWN, BUTTON_VIEW }, |
97 | 97 | ||
98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 98 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 99 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
diff --git a/apps/keymaps/keymap-iaudio67.c b/apps/keymaps/keymap-iaudio67.c index a1eeb08886..6679ede293 100644 --- a/apps/keymaps/keymap-iaudio67.c +++ b/apps/keymaps/keymap-iaudio67.c | |||
@@ -71,6 +71,7 @@ static const struct button_mapping button_context_wps[] = { | |||
71 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 71 | { ACTION_WPS_STOPSEEK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, |
72 | 72 | ||
73 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 73 | { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
74 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
74 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, | 75 | { ACTION_WPS_STOP, BUTTON_STOP, BUTTON_NONE }, |
75 | 76 | ||
76 | LAST_ITEM_IN_LIST | 77 | LAST_ITEM_IN_LIST |
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 02c562eb45..83f46e6575 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -91,6 +91,7 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | 91 | { ACTION_WPS_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
92 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 92 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
93 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 93 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
94 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, | ||
94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 95 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
95 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 96 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
96 | 97 | ||
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c index 8318bd42e7..adcbf78206 100644 --- a/apps/keymaps/keymap-m200.c +++ b/apps/keymaps/keymap-m200.c | |||
@@ -82,6 +82,7 @@ static const struct button_mapping button_context_wps[] = { | |||
82 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | 82 | { ACTION_WPS_CONTEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
83 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | 83 | { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, |
84 | // { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 84 | // { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
85 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
85 | 86 | ||
86 | LAST_ITEM_IN_LIST | 87 | LAST_ITEM_IN_LIST |
87 | }; /* button_context_wps */ | 88 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-m3.c b/apps/keymaps/keymap-m3.c index c5c0796644..5bd0f9d258 100644 --- a/apps/keymaps/keymap-m3.c +++ b/apps/keymaps/keymap-m3.c | |||
@@ -351,6 +351,7 @@ static const struct button_mapping button_context_wps[] = { | |||
351 | { ACTION_WPS_CONTEXT, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, | 351 | { ACTION_WPS_CONTEXT, BUTTON_MODE|BUTTON_REPEAT, BUTTON_MODE }, |
352 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 352 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
353 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 353 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
354 | { ACTION_WPS_VIEW_PLAYLIST,BUTTON_REC|BUTTON_MODE, BUTTON_REC }, | ||
354 | 355 | ||
355 | LAST_ITEM_IN_LIST | 356 | LAST_ITEM_IN_LIST |
356 | }; /* button_context_wps */ | 357 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-meizu-m6sl.c b/apps/keymaps/keymap-meizu-m6sl.c index 0741f632b7..1d7ca42412 100644 --- a/apps/keymaps/keymap-meizu-m6sl.c +++ b/apps/keymaps/keymap-meizu-m6sl.c | |||
@@ -87,8 +87,8 @@ static const struct button_mapping button_context_wps[] = { | |||
87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 88 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
89 | 89 | ||
90 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, | 90 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, |
91 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, | 91 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_DOWN, BUTTON_PLAY }, |
92 | 92 | ||
93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 94 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index 4f178b7793..f7138a506d 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -96,6 +96,7 @@ static const struct button_mapping button_context_wps[] = { | |||
96 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, | 96 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_UP, BUTTON_DISPLAY }, |
97 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, | 97 | { ACTION_WPS_PITCHSCREEN, BUTTON_DISPLAY|BUTTON_DOWN, BUTTON_DISPLAY }, |
98 | { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, | 98 | { ACTION_WPS_ID3SCREEN, BUTTON_DISPLAY|BUTTON_MENU, BUTTON_NONE }, |
99 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_PLAY|BUTTON_ON, BUTTON_PLAY }, | ||
99 | 100 | ||
100 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 101 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
101 | 102 | ||
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 586fcb5e7b..5e56117298 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c | |||
@@ -67,6 +67,7 @@ static const struct button_mapping button_context_wps[] = { | |||
67 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 67 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
68 | /* { ACTION_WPS_MENU, BUTTON_NONE, BUTTON_NONE }, we can't have that */ | 68 | /* { ACTION_WPS_MENU, BUTTON_NONE, BUTTON_NONE }, we can't have that */ |
69 | { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_DOWN, BUTTON_NONE }, | 69 | { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_DOWN, BUTTON_NONE }, |
70 | /* { ACTION_WPS_VIEW_PLAYLIST,BUTTON_NONE, BUTTON_NONE }, can't have this either */ | ||
70 | 71 | ||
71 | LAST_ITEM_IN_LIST | 72 | LAST_ITEM_IN_LIST |
72 | }; | 73 | }; |
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index 82362ecedb..5fce6be83e 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c | |||
@@ -63,6 +63,7 @@ static const struct button_mapping button_context_wps[] = { | |||
63 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 63 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
64 | { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, | 64 | { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, |
65 | { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_STOP, BUTTON_NONE }, | 65 | { ACTION_STD_KEYLOCK, BUTTON_MENU|BUTTON_STOP, BUTTON_NONE }, |
66 | { ACTION_WPS_VIEW_PLAYLIST,BUTTON_MENU|BUTTON_ON, BUTTON_NONE }, | ||
66 | 67 | ||
67 | LAST_ITEM_IN_LIST | 68 | LAST_ITEM_IN_LIST |
68 | }; | 69 | }; |
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 08c1213fa4..60f7f34b6a 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -75,7 +75,8 @@ static const struct button_mapping button_context_wps[] = { | |||
75 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 75 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
76 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, | 76 | { ACTION_WPS_MENU, BUTTON_F1|BUTTON_REL, BUTTON_F1 }, |
77 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 77 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
78 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2, BUTTON_NONE }, | 78 | { ACTION_WPS_QUICKSCREEN, BUTTON_F2|BUTTON_REPEAT, BUTTON_NONE }, |
79 | { ACTION_WPS_VIEW_PLAYLIST,BUTTON_F2|BUTTON_REL, BUTTON_F2 }, | ||
79 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 80 | { ACTION_WPS_BROWSE, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
80 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, | 81 | { ACTION_WPS_ID3SCREEN, BUTTON_F1|BUTTON_ON, BUTTON_NONE }, |
81 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, | 82 | { ACTION_WPS_PITCHSCREEN, BUTTON_ON|BUTTON_UP, BUTTON_ON }, |
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c index 098e216a42..06e93b085d 100644 --- a/apps/keymaps/keymap-sa9200.c +++ b/apps/keymaps/keymap-sa9200.c | |||
@@ -100,6 +100,7 @@ static const struct button_mapping button_context_wps[] = { | |||
100 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 100 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
101 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 101 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
102 | { ACTION_WPS_PITCHSCREEN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 102 | { ACTION_WPS_PITCHSCREEN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
103 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | ||
103 | { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 104 | { ACTION_WPS_ID3SCREEN, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
104 | 105 | ||
105 | LAST_ITEM_IN_LIST | 106 | LAST_ITEM_IN_LIST |
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index b285446546..0d9595cd1d 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -83,6 +83,7 @@ static const struct button_mapping button_context_wps[] = { | |||
83 | { ACTION_WPS_BROWSE, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, | 83 | { ACTION_WPS_BROWSE, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, |
84 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | 84 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, |
85 | { ACTION_WPS_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, | 85 | { ACTION_WPS_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, |
86 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, | ||
86 | 87 | ||
87 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) | 88 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) |
88 | }; /* button_context_wps */ | 89 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index b6d8f9bb50..40e6b4c225 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -367,6 +367,7 @@ static const struct button_mapping button_context_wps[] = { | |||
367 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | 367 | { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
368 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | 368 | { ACTION_WPS_MENU, BUTTON_REC|BUTTON_REL, BUTTON_REC }, |
369 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | 369 | { ACTION_WPS_QUICKSCREEN, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, |
370 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_REC|BUTTON_SELECT, BUTTON_NONE }, | ||
370 | 371 | ||
371 | LAST_ITEM_IN_LIST | 372 | LAST_ITEM_IN_LIST |
372 | }; /* button_context_wps */ | 373 | }; /* button_context_wps */ |
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 2df862134f..4f9a010991 100755 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -89,6 +89,7 @@ static const struct button_mapping button_context_wps[] = { | |||
89 | 89 | ||
90 | /* these match context_standard */ | 90 | /* these match context_standard */ |
91 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 91 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
92 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
92 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 93 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
93 | { ACTION_WPS_QUICKSCREEN, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_FFWD }, | 94 | { ACTION_WPS_QUICKSCREEN, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_FFWD }, |
94 | 95 | ||
diff --git a/apps/recorder/jpeg_load.c b/apps/recorder/jpeg_load.c index 65ddd2a9e4..ec1143f279 100644 --- a/apps/recorder/jpeg_load.c +++ b/apps/recorder/jpeg_load.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include "debug.h" | 31 | #include "debug.h" |
32 | #include "jpeg_load.h" | 32 | #include "jpeg_load.h" |
33 | /*#define JPEG_BS_DEBUG*/ | 33 | /*#define JPEG_BS_DEBUG*/ |
34 | #define ROCKBOX_DEBUG_JPEG | 34 | //#define ROCKBOX_DEBUG_JPEG |
35 | /* for portability of below JPEG code */ | 35 | /* for portability of below JPEG code */ |
36 | #define MEMSET(p,v,c) memset(p,v,c) | 36 | #define MEMSET(p,v,c) memset(p,v,c) |
37 | #define MEMCPY(d,s,c) memcpy(d,s,c) | 37 | #define MEMCPY(d,s,c) memcpy(d,s,c) |
diff --git a/firmware/target/arm/samsung/adc-target.h b/firmware/target/arm/samsung/adc-target.h index e84fc23ef8..a95bcd2e99 100644 --- a/firmware/target/arm/samsung/adc-target.h +++ b/firmware/target/arm/samsung/adc-target.h | |||
@@ -28,8 +28,15 @@ | |||
28 | #define ADC_CHANNEL_2 2 | 28 | #define ADC_CHANNEL_2 2 |
29 | #define ADC_CHANNEL_3 3 | 29 | #define ADC_CHANNEL_3 3 |
30 | 30 | ||
31 | #define ADC_BATTERY ADC_CHANNEL_0 | ||
32 | /* | ||
33 | #define ADC_UNKNOWN_1 1 | ||
34 | #define ADC_REMOTE 2 | ||
35 | #define ADC_SCROLLPAD 3 | ||
36 | */ | ||
31 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ | 37 | #define ADC_UNREG_POWER ADC_BATTERY /* For compatibility */ |
32 | 38 | ||
39 | |||
33 | /* Force a scan now */ | 40 | /* Force a scan now */ |
34 | unsigned short adc_scan(int channel); | 41 | unsigned short adc_scan(int channel); |
35 | 42 | ||
diff --git a/wps/cabbiev2.240x400x16.wps b/wps/cabbiev2.240x400x16.wps index 97f9696996..9d45643074 100644 --- a/wps/cabbiev2.240x400x16.wps +++ b/wps/cabbiev2.240x400x16.wps | |||
@@ -8,6 +8,7 @@ | |||
8 | %T|206|372|24|24|play| | 8 | %T|206|372|24|24|play| |
9 | %T|182|372|18|92|repmode| | 9 | %T|182|372|18|92|repmode| |
10 | %T|139|372|37|23|shuffle| | 10 | %T|139|372|37|23|shuffle| |
11 | %T|90|238|60|20|playlist| | ||
11 | 12 | ||
12 | %X|wpsbackdrop-240x400x16.bmp| | 13 | %X|wpsbackdrop-240x400x16.bmp| |
13 | %xl|A|lock-240x320x16.bmp|11|372|2| | 14 | %xl|A|lock-240x320x16.bmp|11|372|2| |
diff --git a/wps/cabbiev2.320x240x16.mrobe500.wps b/wps/cabbiev2.320x240x16.mrobe500.wps index a18babd0f4..89362c5eb9 100644 --- a/wps/cabbiev2.320x240x16.mrobe500.wps +++ b/wps/cabbiev2.320x240x16.mrobe500.wps | |||
@@ -49,6 +49,8 @@ | |||
49 | %s%ac%Ia | 49 | %s%ac%Ia |
50 | 50 | ||
51 | %V|0|180|-|20|1|-|-| | 51 | %V|0|180|-|20|1|-|-| |
52 | #touch the X of X regions to let the playlist viewer pop up | ||
53 | %T|130|0|60|20|playlist| | ||
52 | %al %pc%ac%pp of %pe%ar%pr | 54 | %al %pc%ac%pp of %pe%ar%pr |
53 | 55 | ||
54 | #viewport for the touch icons | 56 | #viewport for the touch icons |