1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-27 01:22:30 +00:00

stream_dvd[nav]: Add const qualifiers to string arguments

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31957 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-08-11 20:44:29 +00:00 committed by Uoti Urpala
parent a62d145bdf
commit e2d5a13f76
4 changed files with 8 additions and 8 deletions

View File

@ -125,7 +125,7 @@ int dvd_lang_from_aid(stream_t *stream, int id) {
return 0; return 0;
} }
int dvd_aid_from_lang(stream_t *stream, unsigned char* lang) { int dvd_aid_from_lang(stream_t *stream, const unsigned char* lang) {
dvd_priv_t *d=stream->priv; dvd_priv_t *d=stream->priv;
int code,i; int code,i;
if(lang) { if(lang) {
@ -169,7 +169,7 @@ int dvd_lang_from_sid(stream_t *stream, int id) {
return 0; return 0;
} }
int dvd_sid_from_lang(stream_t *stream, unsigned char* lang) { int dvd_sid_from_lang(stream_t *stream, const unsigned char* lang) {
dvd_priv_t *d=stream->priv; dvd_priv_t *d=stream->priv;
int code,i; int code,i;
while(lang && strlen(lang)>=2) { while(lang && strlen(lang)>=2) {

View File

@ -59,8 +59,8 @@ typedef struct {
int dvd_number_of_subs(stream_t *stream); int dvd_number_of_subs(stream_t *stream);
int dvd_lang_from_aid(stream_t *stream, int id); int dvd_lang_from_aid(stream_t *stream, int id);
int dvd_lang_from_sid(stream_t *stream, int id); int dvd_lang_from_sid(stream_t *stream, int id);
int dvd_aid_from_lang(stream_t *stream, unsigned char* lang); int dvd_aid_from_lang(stream_t *stream, const unsigned char* lang);
int dvd_sid_from_lang(stream_t *stream, unsigned char* lang); int dvd_sid_from_lang(stream_t *stream, const unsigned char* lang);
int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell); int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
#endif /* MPLAYER_STREAM_DVD_H */ #endif /* MPLAYER_STREAM_DVD_H */

View File

@ -733,7 +733,7 @@ static int mp_dvdnav_get_aid_from_format (stream_t *stream, int index, uint8_t l
* \param lang: 2-characters language code[s], eventually separated by spaces of commas * \param lang: 2-characters language code[s], eventually separated by spaces of commas
* \return -1 on error, current subtitle id if successful * \return -1 on error, current subtitle id if successful
*/ */
int mp_dvdnav_aid_from_lang(stream_t *stream, unsigned char *language) { int mp_dvdnav_aid_from_lang(stream_t *stream, const unsigned char *language) {
dvdnav_priv_t * priv = stream->priv; dvdnav_priv_t * priv = stream->priv;
int k; int k;
uint8_t lg; uint8_t lg;
@ -785,7 +785,7 @@ int mp_dvdnav_lang_from_aid(stream_t *stream, int aid, unsigned char *buf) {
* \param lang: 2-characters language code[s], eventually separated by spaces of commas * \param lang: 2-characters language code[s], eventually separated by spaces of commas
* \return -1 on error, current subtitle id if successful * \return -1 on error, current subtitle id if successful
*/ */
int mp_dvdnav_sid_from_lang(stream_t *stream, unsigned char *language) { int mp_dvdnav_sid_from_lang(stream_t *stream, const unsigned char *language) {
dvdnav_priv_t * priv = stream->priv; dvdnav_priv_t * priv = stream->priv;
uint8_t lg, k; uint8_t lg, k;
uint16_t lang, lcode; uint16_t lang, lcode;

View File

@ -30,9 +30,9 @@ typedef struct {
int mp_dvdnav_number_of_subs(stream_t *stream); int mp_dvdnav_number_of_subs(stream_t *stream);
int mp_dvdnav_aid_from_audio_num(stream_t *stream, int audio_num); int mp_dvdnav_aid_from_audio_num(stream_t *stream, int audio_num);
int mp_dvdnav_aid_from_lang(stream_t *stream, unsigned char *language); int mp_dvdnav_aid_from_lang(stream_t *stream, const unsigned char *language);
int mp_dvdnav_lang_from_aid(stream_t *stream, int id, unsigned char *buf); int mp_dvdnav_lang_from_aid(stream_t *stream, int id, unsigned char *buf);
int mp_dvdnav_sid_from_lang(stream_t *stream, unsigned char *language); int mp_dvdnav_sid_from_lang(stream_t *stream, const unsigned char *language);
int mp_dvdnav_lang_from_sid(stream_t *stream, int sid, unsigned char *buf); int mp_dvdnav_lang_from_sid(stream_t *stream, int sid, unsigned char *buf);
void mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button); void mp_dvdnav_handle_input(stream_t *stream, int cmd, int *button);
void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button); void mp_dvdnav_update_mouse_pos(stream_t *stream, int32_t x, int32_t y, int* button);