Skip to content

V
vlc
Commit b0899551 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/access/dvdnav.c: fixed typo.

parent 8235c2c5
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 16 deletions
modules/access/dvdnav.c
View file @ b0899551
...@@ -243,21 +243,22 @@ static int Open( vlc_object_t *p_this ) ...@@ -243,21 +243,22 @@ 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 or to create a --menu-language option */ * XXX: maybe it would be better to set it like audio/spu
if( dvdnav_menu_language_select( p_sys->dvdnav,LANGUAGE_DEFAULT ) != DVDNAV_STATUS_OK ) * or to create a --menu-language option */
if( dvdnav_menu_language_select( p_sys->dvdnav,LANGUAGE_DEFAULT ) !=
DVDNAV_STATUS_OK )
{ {
msg_Warn( p_demux, "something failed while setting menu '%s' language (%s)", msg_Warn( p_demux, "can't set menu language to '%s' (%s)",
LANGUAGE_DEFAULT, LANGUAGE_DEFAULT, dvdnav_err_to_string( p_sys->dvdnav ) );
dvdnav_err_to_string( p_sys->dvdnav ) );
} }
/* Set audio language */ /* Set audio language */
psz_code = DemuxGetLanguageCode( p_demux, "audio-language" ); psz_code = DemuxGetLanguageCode( p_demux, "audio-language" );
if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) != DVDNAV_STATUS_OK ) if( dvdnav_audio_language_select(p_sys->dvdnav, psz_code ) !=
DVDNAV_STATUS_OK )
{ {
msg_Warn( p_demux, "something failed while setting audio '%s' language (%s)", msg_Warn( p_demux, "can't set audio language to '%s' (%s)",
psz_code, psz_code, dvdnav_err_to_string( p_sys->dvdnav ) );
dvdnav_err_to_string( p_sys->dvdnav ) );
/* We try to fall back to 'en' */ /* We try to fall back to 'en' */
if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT ); dvdnav_audio_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT );
...@@ -266,11 +267,11 @@ static int Open( vlc_object_t *p_this ) ...@@ -266,11 +267,11 @@ static int Open( vlc_object_t *p_this )
/* Set spu language */ /* Set spu language */
psz_code = DemuxGetLanguageCode( p_demux, "spu-language" ); psz_code = DemuxGetLanguageCode( p_demux, "spu-language" );
if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) != DVDNAV_STATUS_OK ) if( dvdnav_spu_language_select( p_sys->dvdnav,psz_code ) !=
DVDNAV_STATUS_OK )
{ {
msg_Warn( p_demux, "something failed while setting spu '%s' language (%s)", msg_Warn( p_demux, "can't set spu language to '%s' (%s)",
psz_code, psz_code, dvdnav_err_to_string( p_sys->dvdnav ) );
dvdnav_err_to_string( p_sys->dvdnav ) );
/* We try to fall back to 'en' */ /* We try to fall back to 'en' */
if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) if( strcmp( psz_code, LANGUAGE_DEFAULT ) )
dvdnav_spu_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT ); dvdnav_spu_language_select(p_sys->dvdnav, LANGUAGE_DEFAULT );
...@@ -778,9 +779,9 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var ) ...@@ -778,9 +779,9 @@ static char *DemuxGetLanguageCode( demux_t *p_demux, char *psz_var )
char *p; char *p;
psz_lang = var_CreateGetString( p_demux, psz_var ); psz_lang = var_CreateGetString( p_demux, psz_var );
/* XXX: we will use only the first value (and ignore other ones in case of a list) */ /* XXX: we will use only the first value
if( ( p = strchr( psz_lang, "," ) ) ) * (and ignore other ones in case of a list) */
*p = '\0'; if( ( p = strchr( psz_lang, ',' ) ) ) *p = '\0';
for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ ) for( pl = p_languages; pl->psz_iso639_1 != NULL; pl++ )
{ {
......
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