summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-08-11 20:44:29 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:15:48 +0200
commite2d5a13f76efd3234d2cfab422c12f6ada5ac201 (patch)
tree4ef283f2672bc0e00cb9b567d2ad353fc1ff2a2d /stream
parenta62d145bdf549bbd90a97b9fc39385a13ea0471d (diff)
downloadmpv-e2d5a13f76efd3234d2cfab422c12f6ada5ac201.tar.bz2
mpv-e2d5a13f76efd3234d2cfab422c12f6ada5ac201.tar.xz
stream_dvd[nav]: Add const qualifiers to string arguments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31957 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_dvd.c4
-rw-r--r--stream/stream_dvd.h4
-rw-r--r--stream/stream_dvdnav.c4
-rw-r--r--stream/stream_dvdnav.h4
4 files changed, 8 insertions, 8 deletions
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 03f5040536..0a93c18767 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -125,7 +125,7 @@ int dvd_lang_from_aid(stream_t *stream, int id) {
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;
int code,i;
if(lang) {
@@ -169,7 +169,7 @@ int dvd_lang_from_sid(stream_t *stream, int id) {
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;
int code,i;
while(lang && strlen(lang)>=2) {
diff --git a/stream/stream_dvd.h b/stream/stream_dvd.h
index 5872cb1d59..f0f0b5d08f 100644
--- a/stream/stream_dvd.h
+++ b/stream/stream_dvd.h
@@ -59,8 +59,8 @@ typedef struct {
int dvd_number_of_subs(stream_t *stream);
int dvd_lang_from_aid(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_sid_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, const unsigned char* lang);
int dvd_chapter_from_cell(dvd_priv_t *dvd,int title,int cell);
#endif /* MPLAYER_STREAM_DVD_H */
diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c
index 5932fd049c..bbd2b2085b 100644
--- a/stream/stream_dvdnav.c
+++ b/stream/stream_dvdnav.c
@@ -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
* \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;
int k;
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
* \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;
uint8_t lg, k;
uint16_t lang, lcode;
diff --git a/stream/stream_dvdnav.h b/stream/stream_dvdnav.h
index 656d1b8e62..97c2cb6d71 100644
--- a/stream/stream_dvdnav.h
+++ b/stream/stream_dvdnav.h
@@ -30,9 +30,9 @@ typedef struct {
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_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_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);
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);