Mercurial > mplayer.hg
comparison command.c @ 26986:4bee4b9ec054
Rename some functions as they are mplayer related and not
from libdvdnav public API.
author | ben |
---|---|
date | Sat, 07 Jun 2008 12:57:23 +0000 |
parents | 4ab1cfcee430 |
children | d7e0e33c546f |
comparison
equal
deleted
inserted
replaced
26985:9ab366f856c1 | 26986:4bee4b9ec054 |
---|---|
824 } | 824 } |
825 #endif | 825 #endif |
826 | 826 |
827 #ifdef USE_DVDNAV | 827 #ifdef USE_DVDNAV |
828 else if (mpctx->stream->type == STREAMTYPE_DVDNAV) | 828 else if (mpctx->stream->type == STREAMTYPE_DVDNAV) |
829 dvdnav_lang_from_aid(mpctx->stream, audio_id, lang); | 829 mp_dvdnav_lang_from_aid(mpctx->stream, audio_id, lang); |
830 #endif | 830 #endif |
831 *(char **) arg = malloc(64); | 831 *(char **) arg = malloc(64); |
832 snprintf(*(char **) arg, 64, "(%d) %s", audio_id, lang); | 832 snprintf(*(char **) arg, 64, "(%d) %s", audio_id, lang); |
833 } | 833 } |
834 return M_PROPERTY_OK; | 834 return M_PROPERTY_OK; |
1340 } | 1340 } |
1341 #ifdef USE_DVDNAV | 1341 #ifdef USE_DVDNAV |
1342 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { | 1342 if (mpctx->stream->type == STREAMTYPE_DVDNAV) { |
1343 if (vo_spudec && dvdsub_id >= 0) { | 1343 if (vo_spudec && dvdsub_id >= 0) { |
1344 unsigned char lang[3]; | 1344 unsigned char lang[3]; |
1345 if (dvdnav_lang_from_sid(mpctx->stream, dvdsub_id, lang)) { | 1345 if (mp_dvdnav_lang_from_sid(mpctx->stream, dvdsub_id, lang)) { |
1346 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); | 1346 snprintf(*(char **) arg, 63, "(%d) %s", dvdsub_id, lang); |
1347 return M_PROPERTY_OK; | 1347 return M_PROPERTY_OK; |
1348 } | 1348 } |
1349 } | 1349 } |
1350 } | 1350 } |