Mercurial > mplayer.hg
changeset 29288:4a1c217a844b
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).
| author | reimar |
|---|---|
| date | Sat, 30 May 2009 13:18:57 +0000 |
| parents | 8b0f2c4971f4 |
| children | 6825c69f6d84 |
| files | libmpdemux/asfheader.c libmpdemux/aviheader.c libmpdemux/demux_lavf.c libmpdemux/demux_mov.c libmpdemux/demux_ogg.c libmpdemux/demux_real.c libmpdemux/demux_viv.c |
| diffstat | 7 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/asfheader.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/asfheader.c Sat May 30 13:18:57 2009 +0000 @@ -565,7 +565,7 @@ 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); } }
--- a/libmpdemux/aviheader.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/aviheader.c Sat May 30 13:18:57 2009 +0000 @@ -167,7 +167,7 @@ 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;
--- a/libmpdemux/demux_lavf.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/demux_lavf.c Sat May 30 13:18:57 2009 +0000 @@ -476,7 +476,7 @@ 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 );
--- a/libmpdemux/demux_mov.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/demux_mov.c Sat May 30 13:18:57 2009 +0000 @@ -1549,7 +1549,7 @@ 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'):
--- a/libmpdemux/demux_ogg.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/demux_ogg.c Sat May 30 13:18:57 2009 +0000 @@ -375,7 +375,7 @@ } table[] = { { "ENCODED_USING", "Software" }, { "ENCODER_URL", "Encoder URL" }, - { "TITLE", "Name" }, + { "TITLE", "Title" }, { "ARTIST", "Artist" }, { "COMMENT", "Comments" }, { "DATE", "Creation Date" },
--- a/libmpdemux/demux_real.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/demux_real.c Sat May 30 13:18:57 2009 +0000 @@ -1181,7 +1181,7 @@ 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); }
--- a/libmpdemux/demux_viv.c Sat May 30 13:15:53 2009 +0000 +++ b/libmpdemux/demux_viv.c Sat May 30 13:18:57 2009 +0000 @@ -208,7 +208,7 @@ /* 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"))