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

7 files changed, 7 insertions, 7 deletions

diff --git a/libmpdemux/asfheader.c b/libmpdemux/asfheader.c
index 727baccf0b..d6e72f2497 100644
--- a/libmpdemux/asfheader.c
+++ b/libmpdemux/asfheader.c
@@ -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);
           }
         }
diff --git a/libmpdemux/aviheader.c b/libmpdemux/aviheader.c
index 0b7380cf68..dae0313108 100644
--- a/libmpdemux/aviheader.c
+++ b/libmpdemux/aviheader.c
@@ -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;
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c
index 5383e161c8..3eb204e239 100644
--- a/libmpdemux/demux_lavf.c
+++ b/libmpdemux/demux_lavf.c
@@ -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  );
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index fd27ecd5cb..e2c77a32e0 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -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'):
diff --git a/libmpdemux/demux_ogg.c b/libmpdemux/demux_ogg.c
index ae46792d82..2667b4ce1b 100644
--- a/libmpdemux/demux_ogg.c
+++ b/libmpdemux/demux_ogg.c
@@ -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" },
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index b7d523f450..de6ff785ee 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -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);
 		}
 
diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c
index 4501c130cf..b642ee761f 100644
--- a/libmpdemux/demux_viv.c
+++ b/libmpdemux/demux_viv.c
@@ -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"))