diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 18:27:03 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 20:30:08 -0400 |
commit | 7a1bf015417250205c342d5d6e9f7cfa73265439 (patch) | |
tree | 640d702bb66d190fb60a6e6df6b54d8806ae4835 /apps/plugins | |
parent | dc81f96fd1bf3ddfe4c9e750ff14a0238f85d776 (diff) | |
download | rockbox-7a1bf015417250205c342d5d6e9f7cfa73265439.tar.gz rockbox-7a1bf015417250205c342d5d6e9f7cfa73265439.zip |
Undo the hacks that allowed targets without LEFT/RIGHT (UP/DN) to build.
Replaced them with warnings until they are fixed *PROPERLY*
Change-Id: I4425200e60f8b5224262a54f105b974cec471d22
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/pictureflow/pictureflow.c | 4 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 91062f8f11..843df5746e 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -80,7 +80,7 @@ const struct button_mapping pf_context_album_scroll[] = | |||
80 | {PF_PREV_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE}, | 80 | {PF_PREV_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE}, |
81 | {PF_NEXT, BUTTON_RC_FF, BUTTON_NONE}, | 81 | {PF_NEXT, BUTTON_RC_FF, BUTTON_NONE}, |
82 | {PF_NEXT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | 82 | {PF_NEXT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, |
83 | #else | 83 | #elif defined(BUTTON_LEFT) && defined(BUTTON_RIGHT) |
84 | {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, | 84 | {PF_PREV, BUTTON_LEFT, BUTTON_NONE}, |
85 | {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 85 | {PF_PREV_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
86 | {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, | 86 | {PF_NEXT, BUTTON_RIGHT, BUTTON_NONE}, |
@@ -89,6 +89,8 @@ const struct button_mapping pf_context_album_scroll[] = | |||
89 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, | 89 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT}, |
90 | {ACTION_NONE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT}, | 90 | {ACTION_NONE, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT}, |
91 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT}, | 91 | {ACTION_NONE, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT}, |
92 | #else | ||
93 | #warning "LEFT/RIGHT not defined!" | ||
92 | #endif | 94 | #endif |
93 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) | 95 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_PLUGIN|1) |
94 | }; | 96 | }; |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 202cdf6570..29269f18fb 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -85,9 +85,11 @@ static void setoptions (void) | |||
85 | #ifdef HAVE_TOUCHSCREEN | 85 | #ifdef HAVE_TOUCHSCREEN |
86 | options.LEFT = BUTTON_MIDLEFT; | 86 | options.LEFT = BUTTON_MIDLEFT; |
87 | options.RIGHT = BUTTON_MIDRIGHT; | 87 | options.RIGHT = BUTTON_MIDRIGHT; |
88 | #else | 88 | #elif defined(BUTTON_LEFT) && defined(BUTTON_RIGHT) |
89 | options.LEFT = BUTTON_LEFT; | 89 | options.LEFT = BUTTON_LEFT; |
90 | options.RIGHT = BUTTON_RIGHT; | 90 | options.RIGHT = BUTTON_RIGHT; |
91 | #else | ||
92 | #warning "LEFT/RIGHT not defined!" | ||
91 | #endif | 93 | #endif |
92 | 94 | ||
93 | #if CONFIG_KEYPAD == IRIVER_H100_PAD | 95 | #if CONFIG_KEYPAD == IRIVER_H100_PAD |