# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
+#include <vlc_charset.h>
#include <vlc_interface.h>
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
#include "../demux/ps.h"
#include <sys/types.h>
#include <sys/stat.h>
-#include <dvdread/dvd_reader.h>
-#include <dvdread/ifo_types.h>
-#include <dvdread/ifo_read.h>
-#include <dvdread/nav_read.h>
-#include <dvdread/nav_print.h>
+#ifdef HAVE_DVDREAD_DVD_READER_H
+ #include <dvdread/dvd_reader.h>
+ #include <dvdread/ifo_types.h>
+ #include <dvdread/ifo_read.h>
+ #include <dvdread/nav_read.h>
+ #include <dvdread/nav_print.h>
+#else
+ #include <libdvdread/dvd_reader.h>
+ #include <libdvdread/ifo_types.h>
+ #include <libdvdread/ifo_read.h>
+ #include <libdvdread/nav_read.h>
+ #include <libdvdread/nav_print.h>
+#endif
+
+#include <assert.h>
/*****************************************************************************
* Module descriptor
"libcss.\n" \
"The default method is: key.")
-static const char *psz_css_list[] = { "title", "disc", "key" };
-static const char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
+static const char *const psz_css_list[] = { "title", "disc", "key" };
+static const char *const psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
vlc_module_begin();
- set_shortname( _("DVD without menus") );
- set_description( _("DVDRead Input (DVD without menu support)") );
+ set_shortname( N_("DVD without menus") );
+ set_description( N_("DVDRead Input (DVD without menu support)") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "dvdread-angle", 1, NULL, ANGLE_TEXT,
}
}
else
- psz_name = strdup( p_demux->psz_path );
+ psz_name = ToLocaleDup( p_demux->psz_path );
#ifdef WIN32
if( psz_name[0] && psz_name[1] == ':' &&
psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0';
#endif
- /* Override environment variable DVDCSS_METHOD with config option
- * (FIXME: this creates a small memory leak) */
+ /* Override environment variable DVDCSS_METHOD with config option */
psz_dvdcss_env = config_GetPsz( p_demux, "dvdread-css-method" );
if( psz_dvdcss_env && *psz_dvdcss_env )
+#ifdef HAVE_SETENV
+ setenv( "DVDCSS_METHOD", psz_dvdcss_env, 1 );
+#else
{
+ /* FIXME: this create a small memory leak */
char *psz_env;
-
psz_env = malloc( strlen("DVDCSS_METHOD=") +
strlen( psz_dvdcss_env ) + 1 );
if( !psz_env )
free( psz_dvdcss_env );
return VLC_ENOMEM;
}
-
sprintf( psz_env, "%s%s", "DVDCSS_METHOD=", psz_dvdcss_env );
-
putenv( psz_env );
}
+#endif
free( psz_dvdcss_env );
/* Open dvdread */