From 075b16473cfe41bcf7135f7c93b96e5f2afd528b Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman@videolan.org>
Date: Mon, 11 Dec 2006 20:55:22 +0000
Subject: [PATCH] * Some more const warning fixes

---
 modules/access/cdda.c        | 2 +-
 modules/access/cdda/access.c | 1 +
 modules/access/cdda/cdda.c   | 4 ++--
 modules/access/cdda/info.c   | 2 +-
 modules/access/dvdnav.c      | 2 +-
 modules/access/dvdread.c     | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 2ddfa82232..4cddad0adb 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -479,7 +479,7 @@ static int GetTracks( access_t *p_access,
         /* 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 )
             {
diff --git a/modules/access/cdda/access.c b/modules/access/cdda/access.c
index 7965d20d21..209e62b87f 100644
--- a/modules/access/cdda/access.c
+++ b/modules/access/cdda/access.c
@@ -29,6 +29,7 @@
 #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>
diff --git a/modules/access/cdda/cdda.c b/modules/access/cdda/cdda.c
index 9a3a76a6f0..2d7abf6c8e 100644
--- a/modules/access/cdda/cdda.c
+++ b/modules/access/cdda/cdda.c
@@ -38,8 +38,8 @@
  *****************************************************************************/
 
 #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
 
diff --git a/modules/access/cdda/info.c b/modules/access/cdda/info.c
index a5e92b1bef..e8b0caae56 100644
--- a/modules/access/cdda/info.c
+++ b/modules/access/cdda/info.c
@@ -839,7 +839,7 @@ CDDACreatePlaylistItem( const access_t *p_access, cdda_data_t *p_cdda,
                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);
 
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 089c983fc4..c8d2b715e8 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -252,7 +252,7 @@ static int Open( vlc_object_t *p_this )
     /* 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)",
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 9f059f557d..d5ed4a7ac1 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -83,8 +83,8 @@
            "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 * );
-- 
2.39.2