Mercurial > mplayer.hg
annotate libmpdvdkit2/libdvdcss_changes.diff @ 18351:a58f92914b71
fixes suggested by Reimar
author | gpoirier |
---|---|
date | Sun, 30 Apr 2006 07:24:40 +0000 |
parents | 68145aae7349 |
children | e5d97c5f3c32 |
rev | line source |
---|---|
16847
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
1 --- common.h 2005-10-11 10:55:45.000000000 +0200 |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
2 +++ common.h 2005-10-11 14:07:42.000000000 +0200 |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
3 @@ -50,10 +53,9 @@ |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
4 # define PATH_MAX MAX_PATH |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
5 #endif |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
6 |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
7 -#define lseek _lseeki64 |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
8 - |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
9 /* several type definitions */ |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
10 # if defined( __MINGW32__ ) |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
11 +#define lseek _lseeki64 |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
12 # if !defined( _OFF_T_ ) |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
13 typedef long long _off_t; |
72c1c7054ad5
10l to Reimar: common.h belongs to libdvdcss, not libdvdread.
diego
parents:
16714
diff
changeset
|
14 typedef _off_t off_t; |
16714
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
15 --- css.c 2005-07-11 14:24:09.000000000 +0200 |
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
16 +++ css.c 2005-10-01 20:14:37.000000000 +0200 |
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
17 @@ -53,7 +56,7 @@ |
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
18 # include <limits.h> |
14861 | 19 #endif |
20 | |
21 -#include "dvdcss/dvdcss.h" | |
22 +#include "dvdcss.h" | |
23 | |
24 #include "common.h" | |
25 #include "css.h" | |
16630 | 26 --- device.c 2005-07-11 13:33:34.000000000 +0200 |
27 +++ device.c 2005-10-01 19:08:07.000000000 +0200 | |
28 @@ -55,7 +44,7 @@ | |
14861 | 29 # include <sys/uio.h> /* struct iovec */ |
30 #endif | |
31 | |
32 -#include "dvdcss/dvdcss.h" | |
33 +#include "dvdcss.h" | |
34 | |
35 #include "common.h" | |
36 #include "css.h" | |
16630 | 37 @@ -143,8 +132,11 @@ |
38 print_debug( dvdcss, "opening target `%s'", psz_device ); | |
14861 | 39 |
40 #if defined( WIN32 ) | |
41 - /* If device is not "X:", we are actually opening a file. */ | |
42 - dvdcss->b_file = !psz_device[0] || psz_device[1] != ':' || psz_device[2]; | |
43 + dvdcss->b_file = 1; | |
44 + /* If device is "X:" or "X:\", we are not actually opening a file. */ | |
45 + if (psz_device[0] && psz_device[1] == ':' && | |
46 + (!psz_device[2] || (psz_device[2] == '\\' && !psz_device[3]))) | |
47 + dvdcss->b_file = 0; | |
48 | |
49 /* Initialize readv temporary buffer */ | |
50 dvdcss->p_readv_buffer = NULL; | |
16630 | 51 --- error.c 2004-02-24 16:46:49.000000000 +0100 |
16714
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
52 +++ error.c 2005-10-01 20:15:46.000000000 +0200 |
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
53 @@ -34,7 +37,7 @@ |
16630 | 54 # include <limits.h> |
16714
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
55 #endif |
16630 | 56 |
14861 | 57 -#include "dvdcss/dvdcss.h" |
58 +#include "dvdcss.h" | |
59 | |
60 #include "common.h" | |
61 #include "css.h" | |
16630 | 62 --- libdvdcss.c 2004-08-13 15:40:18.000000000 +0200 |
63 +++ libdvdcss.c 2005-10-01 19:11:27.000000000 +0200 | |
16714
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
64 @@ -124,7 +127,7 @@ |
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
65 # include <direct.h> |
2ab52c9b72b9
Replace unconditional #defines by build system trickery.
diego
parents:
16630
diff
changeset
|
66 #endif |
16630 | 67 |
14861 | 68 -#include "dvdcss/dvdcss.h" |
69 +#include "dvdcss.h" | |
70 | |
71 #include "common.h" | |
72 #include "css.h" | |
18109
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
73 @@ -301,6 +301,10 @@ |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
74 { |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
75 psz_home = getenv( "HOME" ); |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
76 } |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
77 + if( psz_home == NULL ) |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
78 + { |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
79 + psz_home = getenv( "USERPROFILE" ); |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
80 + } |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
81 |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
82 /* Cache our keys in ${HOME}/.dvdcss/ */ |
68145aae7349
fallback to USERPROFILE environment variable for caching CSS keys when
reimar
parents:
16848
diff
changeset
|
83 if( psz_home ) |