]>
Commit | Line | Data |
---|---|---|
e3bce59e JB |
1 | --- dxr2-driver/ChangeLog 2002-03-16 01:19:59.000000000 +0100 |
2 | +++ dxr2driver/ChangeLog 2002-03-25 02:57:22.000000000 +0100 | |
3 | @@ -1,3 +1,13 @@ | |
4 | +2002-03-24 Scott Bucholtz <linuxman@linuxmanland.com> | |
5 | + * Applied Tobias Diedrich's <ranma@gmx.at> latest subtitles patch which | |
6 | + takes care of some weird color palettes which were showing up in the | |
7 | + subtitles. | |
8 | + | |
9 | + | |
10 | +2002-03-19 Scott Bucholtz <linuxman@linuxmanland.com> | |
11 | + * Released dxr2-driver-1.0.4. | |
12 | + | |
13 | + | |
14 | 2002-03-15 Scott Bucholtz <linuxman@linuxmanland.com> | |
15 | * Added Tobias Diedrich's <ranma@gmx.at> new subtitles patch | |
16 | which is much easier than the old ones because of the utilization | |
17 | --- dxr2-driver/player/dvd_controls.c 2002-03-16 01:18:36.000000000 +0100 | |
18 | +++ dxr2driver/player/dvd_controls.c 2002-03-25 02:54:36.000000000 +0100 | |
19 | @@ -33,6 +33,7 @@ | |
20 | #include "dvd_controls.h" | |
21 | #include "multifile.h" | |
22 | #include <stdio.h> | |
23 | +#include <dxr2ioctl.h> | |
24 | ||
25 | #define min(x,y) (x < y ? x : y) | |
26 | ||
27 | @@ -264,6 +265,8 @@ | |
28 | ||
29 | int dvd_setup(dvd_controls *con, char *file_name) | |
30 | { | |
31 | + dxr2_palette_t pal; | |
32 | + int i; | |
33 | if (!con->dvd && !(con->dvd=DVDOpen(file_name))) | |
34 | return 0; | |
35 | ||
36 | @@ -317,9 +320,12 @@ | |
37 | con->cur_pgc = con->vts_file->vts_pgcit->pgci_srp[con->pgc_id - 1].pgc; | |
38 | con->next_cell = con->cur_pgc->program_map[con->pgn - 1] - 1; | |
39 | ||
40 | - /* This next line is for the subtitles */ | |
41 | - dxr2_set_subpicture_palettes(con->vmg_file->first_play_pgc->palette); | |
42 | - | |
43 | + /* This is for the subtitles */ | |
44 | + for (i=0; i<16; i++) { | |
45 | + pal.entries[i]=con->vts_file->vts_pgcit->pgci_srp->pgc->palette[i]; | |
46 | + } | |
47 | + dxr2_set_subpicture_palette(pal); | |
48 | + | |
49 | /* | |
50 | * We've got enough info, time to open the title set data. | |
51 | */ | |
52 | --- dxr2-driver/player/dxr2-api.c 2002-03-16 01:20:27.000000000 +0100 | |
53 | +++ dxr2driver/player/dxr2-api.c 2002-03-25 02:59:44.000000000 +0100 | |
54 | @@ -205,7 +205,7 @@ | |
55 | } | |
56 | ||
57 | /* This should do the subtitles correctly */ | |
58 | -int dxr2_set_subpicture_palettes(dxr2_palette_t pal) | |
59 | +int dxr2_set_subpicture_palette(dxr2_palette_t pal) | |
60 | { | |
61 | return dxr2FD<0 ? -1 : ioctl(dxr2FD, DXR2_IOC_SET_SUBPICTURE_PALETTE, &pal); | |
62 | } |