diff options
Diffstat (limited to 'src/input/input_dvd.c')
| -rw-r--r-- | src/input/input_dvd.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 1cd1fb39c..6b4042878 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.56 2002/08/09 15:38:13 mroi Exp $ + * $Id: input_dvd.c,v 1.57 2002/08/09 22:13:08 mroi Exp $ * */ @@ -69,8 +69,12 @@ #include "xine_internal.h" /* DVDNAV includes */ -#include "dvdnav.h" - +#ifdef HAVE_DVDNAV +# include <dvdnav/dvdnav.h> +#else +# include "dvdnav.h" +#endif + /* libdvdread includes */ #include "nav_read.h" @@ -93,8 +97,10 @@ /* The default DVD device on Solaris is not /dev/dvd */ #if defined(__sun) #define DVD_PATH "/vol/dev/aliases/cdrom0" +#define RDVD_PATH NULL #else #define DVD_PATH "/dev/dvd" +#define RDVD_PATH "/dev/rdvd" #endif /* Some misc. defines */ @@ -1300,6 +1306,7 @@ check_solaris_vold_device(dvdnav_input_plugin_t *this) input_plugin_t *init_input_plugin (int iface, xine_t *xine) { dvdnav_input_plugin_t *this; config_values_t *config = xine->config; + char *raw_device; trace_print("Called\n"); @@ -1350,6 +1357,11 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { device_change_cb, (void *)this); this->current_dvd_device = this->dvd_device; + 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); + config->register_num(config, "input.dvd_region", 1, "Region that DVD player claims " @@ -1393,6 +1405,10 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { /* * $Log: input_dvd.c,v $ + * Revision 1.57 2002/08/09 22:13:08 mroi + * make developers life easier: add possibility to use an existing shared + * version of libdvdnav + * * Revision 1.56 2002/08/09 15:38:13 mroi * fix mrl parsing * |