diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-04-09 17:03:48 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-04-09 17:03:48 +0000 |
commit | 61e798ff27edc6a491f76c567ec20f8adab38217 (patch) | |
tree | 86d538678da132e0bce8dd6058a6425d4f605878 /apps | |
parent | 9a535274b86ca860ab5db677ef82e336dffa467c (diff) | |
download | rockbox-61e798ff27edc6a491f76c567ec20f8adab38217.tar.gz rockbox-61e798ff27edc6a491f76c567ec20f8adab38217.zip |
Oscilloscope: Make orientation switching usable on X5, M5 and H10.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13083 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/oscilloscope.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index ee534313d1..57067ab3e3 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -72,8 +72,8 @@ PLUGIN_HEADER | |||
72 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | 72 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT |
73 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | 73 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP |
74 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | 74 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN |
75 | |||
76 | #define OSCILLOSCOPE_RC_QUIT BUTTON_RC_STOP | 75 | #define OSCILLOSCOPE_RC_QUIT BUTTON_RC_STOP |
76 | |||
77 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) | 77 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD) |
78 | #define OSCILLOSCOPE_QUIT (BUTTON_SELECT | BUTTON_MENU) | 78 | #define OSCILLOSCOPE_QUIT (BUTTON_SELECT | BUTTON_MENU) |
79 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_PLAY) | 79 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_PLAY) |
@@ -112,6 +112,7 @@ PLUGIN_HEADER | |||
112 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT | 112 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT |
113 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) | 113 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_SELECT | BUTTON_REL) |
114 | #define OSCILLOSCOPE_ADVMODE BUTTON_REC | 114 | #define OSCILLOSCOPE_ADVMODE BUTTON_REC |
115 | #define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_SELECT | ||
115 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_REPEAT) | 116 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_SELECT | BUTTON_REPEAT) |
116 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY | 117 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY |
117 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | 118 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT |
@@ -124,6 +125,7 @@ PLUGIN_HEADER | |||
124 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_REW | 125 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_REW |
125 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_REW | BUTTON_REL) | 126 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_REW | BUTTON_REL) |
126 | #define OSCILLOSCOPE_ADVMODE BUTTON_FF | 127 | #define OSCILLOSCOPE_ADVMODE BUTTON_FF |
128 | #define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_REW | ||
127 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_REW | BUTTON_REPEAT) | 129 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_REW | BUTTON_REPEAT) |
128 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY | 130 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY |
129 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | 131 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT |
@@ -641,6 +643,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
641 | break; | 643 | break; |
642 | 644 | ||
643 | case OSCILLOSCOPE_ORIENTATION: | 645 | case OSCILLOSCOPE_ORIENTATION: |
646 | #ifdef OSCILLOSCOPE_ORIENTATION_PRE | ||
647 | if (lastbutton != OSCILLOSCOPE_ORIENTATION_PRE) | ||
648 | break; | ||
649 | #endif | ||
644 | if (++osc.orientation >= MAX_OSC) | 650 | if (++osc.orientation >= MAX_OSC) |
645 | osc.orientation = 0; | 651 | osc.orientation = 0; |
646 | last_pos = 0; | 652 | last_pos = 0; |