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

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
 #define OSCILLOSCOPE_SPEED_DOWN   BUTTON_LEFT
 #define OSCILLOSCOPE_VOL_UP       BUTTON_UP
 #define OSCILLOSCOPE_VOL_DOWN     BUTTON_DOWN
-
 #define OSCILLOSCOPE_RC_QUIT      BUTTON_RC_STOP
+
 #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define OSCILLOSCOPE_QUIT         (BUTTON_SELECT | BUTTON_MENU)
 #define OSCILLOSCOPE_DRAWMODE     (BUTTON_SELECT | BUTTON_PLAY)
@@ -112,6 +112,7 @@ PLUGIN_HEADER
 #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_SELECT
 #define OSCILLOSCOPE_DRAWMODE     (BUTTON_SELECT | BUTTON_REL)
 #define OSCILLOSCOPE_ADVMODE      BUTTON_REC
+#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_SELECT
 #define OSCILLOSCOPE_ORIENTATION  (BUTTON_SELECT | BUTTON_REPEAT)
 #define OSCILLOSCOPE_PAUSE        BUTTON_PLAY
 #define OSCILLOSCOPE_SPEED_UP     BUTTON_RIGHT
@@ -124,6 +125,7 @@ PLUGIN_HEADER
 #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_REW
 #define OSCILLOSCOPE_DRAWMODE     (BUTTON_REW | BUTTON_REL)
 #define OSCILLOSCOPE_ADVMODE      BUTTON_FF
+#define OSCILLOSCOPE_ORIENTATION_PRE BUTTON_REW
 #define OSCILLOSCOPE_ORIENTATION  (BUTTON_REW | BUTTON_REPEAT)
 #define OSCILLOSCOPE_PAUSE        BUTTON_PLAY
 #define OSCILLOSCOPE_SPEED_UP     BUTTON_RIGHT
@@ -641,6 +643,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
                 break;
                 
             case OSCILLOSCOPE_ORIENTATION:
+#ifdef OSCILLOSCOPE_ORIENTATION_PRE
+                if (lastbutton != OSCILLOSCOPE_ORIENTATION_PRE)
+                    break;
+#endif
                 if (++osc.orientation >= MAX_OSC)
                     osc.orientation = 0;
                 last_pos = 0;