diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-21 15:10:09 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2002-08-21 15:10:09 +0000 |
| commit | 583fa4a9bd9affdc99aa114d43b62d1b0c6ccd81 (patch) | |
| tree | d48f5217bc115e63677573769fb74e016e46ba5d /src | |
| parent | 98694c7a1aa6ce42efa289092cceb096db31f08b (diff) | |
| download | xine-lib-583fa4a9bd9affdc99aa114d43b62d1b0c6ccd81.tar.gz xine-lib-583fa4a9bd9affdc99aa114d43b62d1b0c6ccd81.tar.bz2 | |
use raw devices only with our patched local copy of libdvdread
CVS patchset: 2500
CVS date: 2002/08/21 15:10:09
Diffstat (limited to 'src')
| -rw-r--r-- | src/input/input_dvd.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 8d769a0cf..0b7e9684f 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.61 2002/08/19 17:27:11 mroi Exp $ + * $Id: input_dvd.c,v 1.62 2002/08/21 15:10:09 mroi Exp $ * */ @@ -1365,11 +1365,16 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { char *raw_device; static char *decrypt_modes[] = { "key", "disc", "title", NULL }; int mode; - + +#ifndef HAVE_DVDNAV + /* only our local copy of libdvdread supports raw device reads, + * so we don't provide this option, when we are using a shared version + * of libdvdnav/libdvdread */ raw_device = config->register_string(config, "input.dvd_raw_device", RDVD_PATH, "raw device set up for dvd access", NULL, NULL, NULL); if (raw_device) setenv("DVDCSS_RAW_DEVICE", raw_device, 0); +#endif mode = config->register_enum(config, "input.css_decryption_method", 0, decrypt_modes, "the css decryption method libdvdcss should use", @@ -1422,6 +1427,9 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { /* * $Log: input_dvd.c,v $ + * Revision 1.62 2002/08/21 15:10:09 mroi + * use raw devices only with our patched local copy of libdvdread + * * Revision 1.61 2002/08/19 17:27:11 mroi * add config entries for raw device and css decryption method * |