Changeset 2221f03d0371243813a252a4613bd62d81a656ce

Show
Ignore:
Timestamp:
05/09/08 21:31:56 (3 months ago)
Author:
Laurent Aimar <fenrir@videolan.org>
git-committer:
Laurent Aimar <fenrir@videolan.org> 1220643116 +0200
git-parent:

[b8b83532f0cf168caf84ad2606d5ed6c6fedcd2d]

git-author:
Laurent Aimar <fenrir@videolan.org> 1220643022 +0200
Message:

Use sub-language as DVD menu (close #1994)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/access/dvdnav.c

    r36bca79 r2221f03  
    257257    } 
    258258 
    259     /* Set menu language ("en") 
    260      * XXX: maybe it would be better to set it like audio/spu 
    261     * or to create a --menu-language option */ 
    262     if( dvdnav_menu_language_select( p_sys->dvdnav, (char*)LANGUAGE_DEFAULT ) != 
     259    /* Set menu language 
     260     * XXX A menu-language may be better than sub-language */ 
     261    psz_code = DemuxGetLanguageCode( p_demux, "sub-language" ); 
     262    if( dvdnav_menu_language_select( p_sys->dvdnav, psz_code ) != 
    263263        DVDNAV_STATUS_OK ) 
    264264    { 
    265265        msg_Warn( p_demux, "can't set menu language to '%s' (%s)", 
    266                   LANGUAGE_DEFAULT, dvdnav_err_to_string( p_sys->dvdnav ) ); 
    267     } 
     266                  psz_code, dvdnav_err_to_string( p_sys->dvdnav ) ); 
     267        /* We try to fall back to 'en' */ 
     268        if( strcmp( psz_code, LANGUAGE_DEFAULT ) ) 
     269            dvdnav_menu_language_select( p_sys->dvdnav, (char*)LANGUAGE_DEFAULT ); 
     270    } 
     271    free( psz_code ); 
    268272 
    269273    /* Set audio language */