comparison nav_types.patch @ 118:48ba92648842 src

current versions of libdvdread use a nav_types.h we cannot use any more, because the structures differ from what is actually on the disc -> provide a private copy
author mroi
date Thu, 06 Mar 2003 22:43:52 +0000
parents
children
comparison
equal deleted inserted replaced
117:816d82ff7eed 118:48ba92648842
1 The libdvdread version of nav_types.h now differs from the actual disk
2 layout, which is problematic for libdvdread. We provide a patched
3 version of libdvdread's nav_types.h for internal use.
4
5 --- libdvdread/dvdread/nav_types.h 2003-03-06 23:38:10.000000000 +0100
6 +++ libdvdnav/src/nav_types.h 2003-03-06 23:20:24.000000000 +0100
7 @@ -144,10 +144,6 @@
8
9 /**
10 * Button Information
11 - *
12 - * NOTE: I've had to change the structure from the disk layout to get
13 - * the packing to work with Sun's Forte C compiler.
14 - * The 4 and 7 bytes are 'rotated' was: ABC DEF GHIJ is: ABCG DEFH IJ
15 */
16 typedef struct {
17 #ifdef WORDS_BIGENDIAN
18 @@ -156,14 +152,13 @@
19 unsigned int zero1 : 2; /**< reserved */
20 unsigned int x_end : 10; /**< x end offset within the overlay */
21
22 - unsigned int zero3 : 2; /**< reserved */
23 - unsigned int up : 6; /**< button index when pressing up */
24 -
25 unsigned int auto_action_mode : 2; /**< 0: no, 1: activated if selected */
26 unsigned int y_start : 10; /**< y start offset within the overlay */
27 unsigned int zero2 : 2; /**< reserved */
28 unsigned int y_end : 10; /**< y end offset within the overlay */
29
30 + unsigned int zero3 : 2; /**< reserved */
31 + unsigned int up : 6; /**< button index when pressing up */
32 unsigned int zero4 : 2; /**< reserved */
33 unsigned int down : 6; /**< button index when pressing down */
34 unsigned int zero5 : 2; /**< reserved */
35 @@ -176,14 +171,13 @@
36 unsigned int x_start : 10;
37 unsigned int btn_coln : 2;
38
39 - unsigned int up : 6;
40 - unsigned int zero3 : 2;
41 -
42 unsigned int y_end : 10;
43 unsigned int zero2 : 2;
44 unsigned int y_start : 10;
45 unsigned int auto_action_mode : 2;
46
47 + unsigned int up : 6;
48 + unsigned int zero3 : 2;
49 unsigned int down : 6;
50 unsigned int zero4 : 2;
51 unsigned int left : 6;