/* If we have CDDB info, change the name */
if( p_sys->p_disc )
{
- char *psz_result;
+ const char *psz_result;
cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i );
if( t!= NULL )
{
#include "callback.h" /* FIXME - reorganize callback.h, cdda.h better */
#include "cdda.h" /* private structures. Also #includes vlc things */
#include "info.h" /* headers for meta info retrieval */
+#include "access.h"
#include <vlc_playlist.h> /* Has to come *after* cdda.h */
#include "vlc_keys.h"
#include <vlc_interface.h>
*****************************************************************************/
#if LIBCDIO_VERSION_NUM >= 72
-static char *psz_paranoia_list[] = { "none", "overlap", "full" };
-static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
+static const char *psz_paranoia_list[] = { "none", "overlap", "full" };
+static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
N_("full") };
#endif
psz_mrl, psz_title, (long int) i_mduration / 1000000 );
p_child = playlist_ItemNew( p_playlist, psz_mrl, psz_title );
- input_GetItem(p_child)->i_duration = (mtime_t) i_mduration;
+ input_GetItem(p_child->p_input)->i_duration = (mtime_t) i_mduration;
free(psz_mrl);
free(psz_title);
/* Set menu language ("en")
* XXX: maybe it would be better to set it like audio/spu
* or to create a --menu-language option */
- if( dvdnav_menu_language_select( p_sys->dvdnav,LANGUAGE_DEFAULT ) !=
+ if( dvdnav_menu_language_select( p_sys->dvdnav, LANGUAGE_DEFAULT ) !=
DVDNAV_STATUS_OK )
{
msg_Warn( p_demux, "can't set menu language to '%s' (%s)",
"libcss.\n" \
"The default method is: key.")
-static char *psz_css_list[] = { "title", "disc", "key" };
-static char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
+static const char *psz_css_list[] = { "title", "disc", "key" };
+static const char *psz_css_list_text[] = { N_("title"), N_("Disc"), N_("Key") };
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );