diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-11-22 01:15:31 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-11-22 01:15:31 +0000 |
commit | 49a0a945ac5ee6598a2ff15c3b806e5fa0a727be (patch) | |
tree | 2e73c47d0eebbcadd87accf2e80fe3796565a9b2 /uisimulator/win32/button.c | |
parent | b51f7dfc9b507ab9db12fe90b2ddad708f435e06 (diff) | |
download | rockbox-49a0a945ac5ee6598a2ff15c3b806e5fa0a727be.tar.gz rockbox-49a0a945ac5ee6598a2ff15c3b806e5fa0a727be.zip |
Win32 simulator now supports iPod Color. Fixed screendump() to correctly work for iPod simulators on big endian machines. Removed duplicate button definitions.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8035 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32/button.c')
-rw-r--r-- | uisimulator/win32/button.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 47adbb485f..579a74a78a 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -64,6 +64,8 @@ void button_event(int key, bool pressed) | |||
64 | case VK_UP: | 64 | case VK_UP: |
65 | #ifdef BUTTON_UP | 65 | #ifdef BUTTON_UP |
66 | new_btn = BUTTON_UP; | 66 | new_btn = BUTTON_UP; |
67 | #elif defined BUTTON_SCROLL_FWD | ||
68 | new_btn = BUTTON_SCROLL_FWD; | ||
67 | #elif defined BUTTON_PLAY | 69 | #elif defined BUTTON_PLAY |
68 | new_btn = BUTTON_PLAY; | 70 | new_btn = BUTTON_PLAY; |
69 | #endif | 71 | #endif |
@@ -73,16 +75,20 @@ void button_event(int key, bool pressed) | |||
73 | case VK_DOWN: | 75 | case VK_DOWN: |
74 | #ifdef BUTTON_DOWN | 76 | #ifdef BUTTON_DOWN |
75 | new_btn = BUTTON_DOWN; | 77 | new_btn = BUTTON_DOWN; |
78 | #elif defined BUTTON_SCROLL_BACK | ||
79 | new_btn = BUTTON_SCROLL_BACK; | ||
76 | #elif defined BUTTON_STOP | 80 | #elif defined BUTTON_STOP |
77 | new_btn = BUTTON_STOP; | 81 | new_btn = BUTTON_STOP; |
78 | #endif | 82 | #endif |
79 | break; | 83 | break; |
80 | 84 | ||
81 | #ifdef BUTTON_ON | ||
82 | case VK_ADD: | 85 | case VK_ADD: |
86 | #ifdef BUTTON_ON | ||
83 | new_btn = BUTTON_ON; | 87 | new_btn = BUTTON_ON; |
84 | break; | 88 | #elif defined(BUTTON_SELECT) && defined(BUTTON_PLAY) |
89 | new_btn = BUTTON_PLAY; | ||
85 | #endif | 90 | #endif |
91 | break; | ||
86 | 92 | ||
87 | #ifdef BUTTON_OFF | 93 | #ifdef BUTTON_OFF |
88 | case VK_RETURN: | 94 | case VK_RETURN: |
@@ -112,7 +118,7 @@ void button_event(int key, bool pressed) | |||
112 | 118 | ||
113 | case VK_NUMPAD5: | 119 | case VK_NUMPAD5: |
114 | case VK_SPACE: | 120 | case VK_SPACE: |
115 | #ifdef BUTTON_PLAY | 121 | #if defined(BUTTON_PLAY) && !defined(BUTTON_SELECT) |
116 | new_btn = BUTTON_PLAY; | 122 | new_btn = BUTTON_PLAY; |
117 | #elif defined(BUTTON_SELECT) | 123 | #elif defined(BUTTON_SELECT) |
118 | new_btn = BUTTON_SELECT; | 124 | new_btn = BUTTON_SELECT; |