Mercurial > mplayer.hg
annotate input/joystick.h @ 34757:da38eb1e2069
subassconvert: handle "\r\n" line ends
Previously the code converting text subtitles to ASS format converted newline
characters, and only those, to ASS "new line" markup. If the subtitles
contained "\r\n", the "\r" was thus left in the text. In previous libass
versions the "\r" was not visible, but in the current one it produces an empty
box. Improve the conversion to remove the "\r" in that case. Also treat a lone
"\r" as a newline.
Picked from mplayer2/3e0a2705
author | cboesch |
---|---|
date | Sat, 07 Apr 2012 11:17:09 +0000 |
parents | 142c53391eb7 |
children |
rev | line source |
---|---|
28112 | 1 /* |
2 * This file is part of MPlayer. | |
3 * | |
4 * MPlayer is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * MPlayer is distributed in the hope that it will be useful, | |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 * GNU General Public License for more details. | |
13 * | |
14 * You should have received a copy of the GNU General Public License along | |
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., | |
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | |
17 */ | |
18 | |
26029 | 19 #ifndef MPLAYER_JOYSTICK_H |
20 #define MPLAYER_JOYSTICK_H | |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
21 |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
22 #define JOY_BASE (0x100+128) |
4518
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
23 #define JOY_AXIS0_PLUS (JOY_BASE+0) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
24 #define JOY_AXIS0_MINUS (JOY_BASE+1) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
25 #define JOY_AXIS1_PLUS (JOY_BASE+2) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
26 #define JOY_AXIS1_MINUS (JOY_BASE+3) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
27 #define JOY_AXIS2_PLUS (JOY_BASE+4) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
28 #define JOY_AXIS2_MINUS (JOY_BASE+5) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
29 #define JOY_AXIS3_PLUS (JOY_BASE+6) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
30 #define JOY_AXIS3_MINUS (JOY_BASE+7) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
31 #define JOY_AXIS4_PLUS (JOY_BASE+8) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
32 #define JOY_AXIS4_MINUS (JOY_BASE+9) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
33 #define JOY_AXIS5_PLUS (JOY_BASE+10) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
34 #define JOY_AXIS5_MINUS (JOY_BASE+11) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
35 #define JOY_AXIS6_PLUS (JOY_BASE+12) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
36 #define JOY_AXIS6_MINUS (JOY_BASE+13) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
37 #define JOY_AXIS7_PLUS (JOY_BASE+14) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
38 #define JOY_AXIS7_MINUS (JOY_BASE+15) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
39 #define JOY_AXIS8_PLUS (JOY_BASE+16) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
40 #define JOY_AXIS8_MINUS (JOY_BASE+17) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
41 #define JOY_AXIS9_PLUS (JOY_BASE+18) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
42 #define JOY_AXIS9_MINUS (JOY_BASE+19) |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
43 |
4657
610a11e4db36
Added key autorepeat support. Options to enable/disable joystick and lirc
albeu
parents:
4524
diff
changeset
|
44 #define JOY_BTN_BASE ((0x100+148)|MP_NO_REPEAT_KEY) |
4518
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
45 #define JOY_BTN0 (JOY_BTN_BASE+0) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
46 #define JOY_BTN1 (JOY_BTN_BASE+1) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
47 #define JOY_BTN2 (JOY_BTN_BASE+2) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
48 #define JOY_BTN3 (JOY_BTN_BASE+3) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
49 #define JOY_BTN4 (JOY_BTN_BASE+4) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
50 #define JOY_BTN5 (JOY_BTN_BASE+5) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
51 #define JOY_BTN6 (JOY_BTN_BASE+6) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
52 #define JOY_BTN7 (JOY_BTN_BASE+7) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
53 #define JOY_BTN8 (JOY_BTN_BASE+8) |
83128eed25f1
Corrected the quit bug and added support for up to 10 axis
albeu
parents:
4418
diff
changeset
|
54 #define JOY_BTN9 (JOY_BTN_BASE+9) |
4418
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
55 |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
56 int mp_input_joystick_init(char* dev); |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
57 |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
58 int mp_input_joystick_read(int fd); |
8141d2c399e4
A new configurable input system and joystick support for this system
albeu
parents:
diff
changeset
|
59 |
26029 | 60 #endif /* MPLAYER_JOYSTICK_H */ |