Mercurial > mplayer.hg
annotate input/ar.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 | c13288eeb9f6 |
children |
rev | line source |
---|---|
24037 | 1 /* |
2 * Apple Remote input interface | |
3 * | |
4 * Copyright (C) 2007 Zoltan Ponekker <pontscho at kac.poliod.hu> | |
5 * | |
6 * This file is part of MPlayer. | |
7 * | |
8 * MPlayer is free software; you can redistribute it and/or modify | |
9 * it under the terms of the GNU General Public License as published by | |
10 * the Free Software Foundation; either version 2 of the License, or | |
11 * (at your option) any later version. | |
12 * | |
13 * MPlayer is distributed in the hope that it will be useful, | |
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
16 * GNU General Public License for more details. | |
17 * | |
26743
0f42fb42843c
Use standard license headers with standard formatting.
diego
parents:
26029
diff
changeset
|
18 * You should have received a copy of the GNU General Public License along |
0f42fb42843c
Use standard license headers with standard formatting.
diego
parents:
26029
diff
changeset
|
19 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
0f42fb42843c
Use standard license headers with standard formatting.
diego
parents:
26029
diff
changeset
|
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
24037 | 21 */ |
22 | |
26029 | 23 #ifndef MPLAYER_AR_H |
24 #define MPLAYER_AR_H | |
24037 | 25 |
26 #define AR_BASE 0x500 | |
27 #define AR_PLAY (AR_BASE + 0) | |
28 #define AR_PLAY_HOLD (AR_BASE + 1) | |
29 #define AR_NEXT (AR_BASE + 2) | |
30 #define AR_NEXT_HOLD (AR_BASE + 3) | |
31 #define AR_PREV (AR_BASE + 4) | |
32 #define AR_PREV_HOLD (AR_BASE + 5) | |
33 #define AR_MENU (AR_BASE + 6) | |
34 #define AR_MENU_HOLD (AR_BASE + 7) | |
35 #define AR_VUP (AR_BASE + 8) | |
36 #define AR_VDOWN (AR_BASE + 9) | |
37 | |
26763
c13288eeb9f6
Add support for AppleIR Remote as an input under Linux systems.
ben
parents:
26743
diff
changeset
|
38 /* MacOSX Driver */ |
24037 | 39 int mp_input_ar_init(void); |
40 int mp_input_ar_read(int fd); | |
41 void mp_input_ar_close(int fd); | |
42 | |
26763
c13288eeb9f6
Add support for AppleIR Remote as an input under Linux systems.
ben
parents:
26743
diff
changeset
|
43 /* Linux Driver */ |
c13288eeb9f6
Add support for AppleIR Remote as an input under Linux systems.
ben
parents:
26743
diff
changeset
|
44 int mp_input_appleir_init(char* dev); |
c13288eeb9f6
Add support for AppleIR Remote as an input under Linux systems.
ben
parents:
26743
diff
changeset
|
45 int mp_input_appleir_read(int fd); |
c13288eeb9f6
Add support for AppleIR Remote as an input under Linux systems.
ben
parents:
26743
diff
changeset
|
46 |
26029 | 47 #endif /* MPLAYER_AR_H */ |