diff options
author | Björn Stenberg <bjorn@haxx.se> | 2002-05-16 14:46:58 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2002-05-16 14:46:58 +0000 |
commit | 28af55d61a6d392e73a37d0f3b50844459fae5ce (patch) | |
tree | c035a8b1653a28af5c669e8f60360c11088f8fb5 /uisimulator | |
parent | d902f94313fe24826cfd2719bb6cc63ae8157a13 (diff) | |
download | rockbox-28af55d61a6d392e73a37d0f3b50844459fae5ce.tar.gz rockbox-28af55d61a6d392e73a37d0f3b50844459fae5ce.zip |
Added support for player keypad
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@597 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/x11/Makefile | 11 | ||||
-rw-r--r-- | uisimulator/x11/button-x11.c | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index d6cfece145..407f7b9847 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -29,11 +29,14 @@ CC = gcc | |||
29 | RM = rm -f | 29 | RM = rm -f |
30 | DEBUG = -g | 30 | DEBUG = -g |
31 | 31 | ||
32 | #DISPLAY = -DHAVE_LCD_CHARCELLS | 32 | DISPLAY = -DHAVE_LCD_CHARCELLS |
33 | DISPLAY = -DHAVE_LCD_BITMAP | 33 | #DISPLAY = -DHAVE_LCD_BITMAP |
34 | |||
35 | KEYPAD = -DHAVE_PLAYER_KEYPAD | ||
36 | #KEYPAD = -DHAVE_RECORDER_KEYPAD | ||
34 | 37 | ||
35 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 38 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
36 | -DHAVE_RECORDER_KEYPAD $(DISPLAY) | 39 | $(KEYPAD) $(DISPLAY) |
37 | 40 | ||
38 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | 41 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl |
39 | 42 | ||
@@ -46,7 +49,7 @@ ifeq ($(UNAME),Linux) | |||
46 | INCLUDES += -I/usr/X11R6/include | 49 | INCLUDES += -I/usr/X11R6/include |
47 | LIBDIRS = -L/usr/X11R6/lib | 50 | LIBDIRS = -L/usr/X11R6/lib |
48 | DEFINES += -DLINUX -DLITTLE_ENDIAN | 51 | DEFINES += -DLINUX -DLITTLE_ENDIAN |
49 | MPEG_PLAY = 1 | 52 | # MPEG_PLAY = 1 |
50 | else | 53 | else |
51 | DEFINES += -DBIG_ENDIAN | 54 | DEFINES += -DBIG_ENDIAN |
52 | LIBDIRS = | 55 | LIBDIRS = |
diff --git a/uisimulator/x11/button-x11.c b/uisimulator/x11/button-x11.c index c3afa4b42a..b138d1e038 100644 --- a/uisimulator/x11/button-x11.c +++ b/uisimulator/x11/button-x11.c | |||
@@ -63,6 +63,7 @@ static int get_raw_button (void) | |||
63 | case XK_KP_2: | 63 | case XK_KP_2: |
64 | return BUTTON_DOWN; | 64 | return BUTTON_DOWN; |
65 | 65 | ||
66 | #ifdef HAVE_RECORDER_KEYPAD | ||
66 | case XK_KP_Space: | 67 | case XK_KP_Space: |
67 | case XK_KP_5: | 68 | case XK_KP_5: |
68 | return BUTTON_PLAY; | 69 | return BUTTON_PLAY; |
@@ -81,6 +82,7 @@ static int get_raw_button (void) | |||
81 | 82 | ||
82 | case XK_KP_Subtract: | 83 | case XK_KP_Subtract: |
83 | return BUTTON_F3; | 84 | return BUTTON_F3; |
85 | #endif | ||
84 | 86 | ||
85 | default: | 87 | default: |
86 | return 0; | 88 | return 0; |