Commit 075b1647 authored by hartman's avatar hartman
Browse files

* Some more const warning fixes

parent 18f3b1e3
...@@ -479,7 +479,7 @@ static int GetTracks( access_t *p_access, ...@@ -479,7 +479,7 @@ static int GetTracks( access_t *p_access,
/* If we have CDDB info, change the name */ /* If we have CDDB info, change the name */
if( p_sys->p_disc ) 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 ); cddb_track_t *t = cddb_disc_get_track( p_sys->p_disc, i );
if( t!= NULL ) if( t!= NULL )
{ {
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "callback.h" /* FIXME - reorganize callback.h, cdda.h better */ #include "callback.h" /* FIXME - reorganize callback.h, cdda.h better */
#include "cdda.h" /* private structures. Also #includes vlc things */ #include "cdda.h" /* private structures. Also #includes vlc things */
#include "info.h" /* headers for meta info retrieval */ #include "info.h" /* headers for meta info retrieval */
#include "access.h"
#include <vlc_playlist.h> /* Has to come *after* cdda.h */ #include <vlc_playlist.h> /* Has to come *after* cdda.h */
#include "vlc_keys.h" #include "vlc_keys.h"
#include <vlc_interface.h> #include <vlc_interface.h>
......
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
*****************************************************************************/ *****************************************************************************/
#if LIBCDIO_VERSION_NUM >= 72 #if LIBCDIO_VERSION_NUM >= 72
static char *psz_paranoia_list[] = { "none", "overlap", "full" }; static const char *psz_paranoia_list[] = { "none", "overlap", "full" };
static char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"), static const char *psz_paranoia_list_text[] = { N_("none"), N_("overlap"),
N_("full") }; N_("full") };
#endif #endif
......
...@@ -839,7 +839,7 @@ CDDACreatePlaylistItem( const access_t *p_access, cdda_data_t *p_cdda, ...@@ -839,7 +839,7 @@ CDDACreatePlaylistItem( const access_t *p_access, cdda_data_t *p_cdda,
psz_mrl, psz_title, (long int) i_mduration / 1000000 ); psz_mrl, psz_title, (long int) i_mduration / 1000000 );
p_child = playlist_ItemNew( p_playlist, psz_mrl, psz_title ); 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_mrl);
free(psz_title); free(psz_title);
......
...@@ -252,7 +252,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -252,7 +252,7 @@ static int Open( vlc_object_t *p_this )
/* Set menu language ("en") /* Set menu language ("en")
* XXX: maybe it would be better to set it like audio/spu * XXX: maybe it would be better to set it like audio/spu
* or to create a --menu-language option */ * 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 ) DVDNAV_STATUS_OK )
{ {
msg_Warn( p_demux, "can't set menu language to '%s' (%s)", msg_Warn( p_demux, "can't set menu language to '%s' (%s)",
......
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
"libcss.\n" \ "libcss.\n" \
"The default method is: key.") "The default method is: key.")
static char *psz_css_list[] = { "title", "disc", "key" }; static const 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_text[] = { N_("title"), N_("Disc"), N_("Key") };
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close( vlc_object_t * ); static void Close( vlc_object_t * );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment