RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

In all demux_info_add calls change "name" to "title". 

Currently "name" and "title" are both used at random, this makes it consistent.
"title" was chosen because it is less ambiguous and also the get_meta_title
slave mode command uses that (there is no get_meta_name command).


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29330 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2009-05-30 13:18:57 +00:00
parent b60e7f8ba5
commit ea47ab2a9f
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpdemux/asfheader.c
View File

@ -565,7 +565,7 @@ int read_asf_header(demuxer_t *demuxer,struct asf_priv* asf){
if (pos > hdr_len) goto len_err_out;
if ((string = get_ucs2str(wstring, len))) {
mp_msg(MSGT_HEADER,MSGL_V," Title: %s\n", string);
demux_info_add(demuxer, "name", string);
demux_info_add(demuxer, "title", string);
free(string);
}
}

2
libmpdemux/aviheader.c
View File

@ -167,7 +167,7 @@ while(1){
case mmioFOURCC('I','M','E','D'): hdr="Medium";break;
// INAM - Stores the title of the subject of the file, such as
// "Seattle from Above."
case mmioFOURCC('I','N','A','M'): hdr="Name";break;
case mmioFOURCC('I','N','A','M'): hdr="Title";break;
// IPLT - Specifies the number of colors requested when digitizing
// an image, such as "256."
case mmioFOURCC('I','P','L','T'): hdr="Palette Setting";break;

2
libmpdemux/demux_lavf.c
View File

@ -476,7 +476,7 @@ static demuxer_t* demux_open_lavf(demuxer_t *demuxer){
return NULL;
}
if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title );
if(avfc->title [0]) demux_info_add(demuxer, "title" , avfc->title );
if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author );
if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright);
if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment );

2
libmpdemux/demux_mov.c
View File

@ -1549,7 +1549,7 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak
break;
case MOV_FOURCC('n','a','m','e'):
case MOV_FOURCC(0xa9,'n','a','m'):
demux_info_add(demuxer, "name", &text[2]);
demux_info_add(demuxer, "title", &text[2]);
mp_msg(MSGT_DEMUX, MSGL_V, " Name: %s\n", &text[2]);
break;
case MOV_FOURCC(0xa9,'A','R','T'):

2
libmpdemux/demux_ogg.c
View File

@ -375,7 +375,7 @@ static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vor
} table[] = {
{ "ENCODED_USING", "Software" },
{ "ENCODER_URL", "Encoder URL" },
{ "TITLE", "Name" },
{ "TITLE", "Title" },
{ "ARTIST", "Artist" },
{ "COMMENT", "Comments" },
{ "DATE", "Creation Date" },

2
libmpdemux/demux_real.c
View File

@ -1181,7 +1181,7 @@ static demuxer_t* demux_open_real(demuxer_t* demuxer)
buf = malloc(len+1);
stream_read(demuxer->stream, buf, len);
buf[len] = 0;
demux_info_add(demuxer, "name", buf);
demux_info_add(demuxer, "title", buf);
free(buf);
}

2
libmpdemux/demux_viv.c
View File

@ -208,7 +208,7 @@ static void vivo_parse_text_header(demuxer_t *demux, int header_len)
/* only for displaying some informations about movie*/
if (!strcmp(opt, "Title"))
{
demux_info_add(demux, "name", param);
demux_info_add(demux, "title", param);
priv->title = strdup(param);
}
if (!strcmp(opt, "Author"))