diff options
author | Dave Hooper <dave@beermex.com> | 2009-07-18 21:08:38 +0000 |
---|---|---|
committer | Dave Hooper <dave@beermex.com> | 2009-07-18 21:08:38 +0000 |
commit | 7a3845b753883476974768f431bbf90566e4e1bf (patch) | |
tree | 12ed690ad8da93477d16ae76c96a6a00a2caf711 | |
parent | 974a48004a4ede5e9db9c06d036d9d4f0e15bbc3 (diff) | |
download | rockbox-7a3845b753883476974768f431bbf90566e4e1bf.tar.gz rockbox-7a3845b753883476974768f431bbf90566e4e1bf.zip |
Simplify my previous change, don't need separate defines for ipod
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21962 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/clix.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 5a4f683e84..461ef5a58d 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -70,9 +70,7 @@ PLUGIN_HEADER | |||
70 | #define CLIX_BUTTON_DOWN BUTTON_PLAY | 70 | #define CLIX_BUTTON_DOWN BUTTON_PLAY |
71 | #define CLIX_BUTTON_SCROLL_FWD BUTTON_SCROLL_FWD | 71 | #define CLIX_BUTTON_SCROLL_FWD BUTTON_SCROLL_FWD |
72 | #define CLIX_BUTTON_SCROLL_BACK BUTTON_SCROLL_BACK | 72 | #define CLIX_BUTTON_SCROLL_BACK BUTTON_SCROLL_BACK |
73 | #define CLIX_BUTTON_CLICK (BUTTON_SELECT | BUTTON_REL) | 73 | #define CLIX_BUTTON_CLICK BUTTON_SELECT |
74 | #define CLIX_BUTTON_CLICK_PRE BUTTON_SELECT | ||
75 | #define CLIX_BUTTON_CLICK_PRE2 (BUTTON_SELECT | BUTTON_REPEAT) | ||
76 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | 74 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT |
77 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | 75 | #define CLIX_BUTTON_LEFT BUTTON_LEFT |
78 | 76 | ||
@@ -744,15 +742,6 @@ static int clix_handle_game(struct clix_game_state_t* state) | |||
744 | #endif | 742 | #endif |
745 | case CLIX_BUTTON_CLICK: | 743 | case CLIX_BUTTON_CLICK: |
746 | { | 744 | { |
747 | #ifdef CLIX_BUTTON_CLICK_PRE | ||
748 | #ifdef CLIX_BUTTON_CLICK_PRE2 | ||
749 | if (lastbutton != CLIX_BUTTON_CLICK_PRE | ||
750 | && lastbutton != CLIX_BUTTON_CLICK_PRE2) | ||
751 | #else | ||
752 | if (lastbutton != CLIX_BUTTON_CLICK_PRE) | ||
753 | #endif | ||
754 | break; | ||
755 | #endif | ||
756 | if (state->selected_count > 1) { | 745 | if (state->selected_count > 1) { |
757 | switch( clix_clear_selected( state)) | 746 | switch( clix_clear_selected( state)) |
758 | { | 747 | { |