diff options
Diffstat (limited to 'apps/plugins/oscilloscope.c')
-rw-r--r-- | apps/plugins/oscilloscope.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 97a8094e1f..8e14f26bd5 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -30,30 +30,7 @@ | |||
30 | #include "lib/osd.h" | 30 | #include "lib/osd.h" |
31 | 31 | ||
32 | /* variable button definitions */ | 32 | /* variable button definitions */ |
33 | #if CONFIG_KEYPAD == RECORDER_PAD | 33 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
34 | #define OSCILLOSCOPE_QUIT BUTTON_OFF | ||
35 | #define OSCILLOSCOPE_DRAWMODE BUTTON_F1 | ||
36 | #define OSCILLOSCOPE_ADVMODE BUTTON_F2 | ||
37 | #define OSCILLOSCOPE_ORIENTATION BUTTON_F3 | ||
38 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY | ||
39 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
40 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
41 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | ||
42 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | ||
43 | |||
44 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
45 | #define OSCILLOSCOPE_QUIT BUTTON_OFF | ||
46 | #define OSCILLOSCOPE_DRAWMODE_PRE BUTTON_MENU | ||
47 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_MENU | BUTTON_REL) | ||
48 | #define OSCILLOSCOPE_ADVMODE (BUTTON_MENU | BUTTON_RIGHT) | ||
49 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_MENU | BUTTON_LEFT) | ||
50 | #define OSCILLOSCOPE_PAUSE (BUTTON_MENU | BUTTON_OFF) | ||
51 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | ||
52 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | ||
53 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | ||
54 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN | ||
55 | |||
56 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
57 | #define OSCILLOSCOPE_QUIT BUTTON_OFF | 34 | #define OSCILLOSCOPE_QUIT BUTTON_OFF |
58 | #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT | 35 | #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT |
59 | #define OSCILLOSCOPE_ADVMODE BUTTON_MODE | 36 | #define OSCILLOSCOPE_ADVMODE BUTTON_MODE |
@@ -934,9 +911,6 @@ static void get_peaks(int *left, int *right) | |||
934 | #elif defined (SIMULATOR) | 911 | #elif defined (SIMULATOR) |
935 | *left = rand() % 0x8000; | 912 | *left = rand() % 0x8000; |
936 | *right = rand() % 0x8000; | 913 | *right = rand() % 0x8000; |
937 | #elif (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | ||
938 | *left = rb->mas_codec_readreg(0xC); | ||
939 | *right = rb->mas_codec_readreg(0xD); | ||
940 | #else | 914 | #else |
941 | *left = 0; | 915 | *left = 0; |
942 | *right = 0; | 916 | *right = 0; |