[MPlayer-cvslog] r29330 - in trunk/libmpdemux: asfheader.c aviheader.c demux_lavf.c demux_mov.c demux_ogg.c demux_real.c demux_viv.c

[reimar]

Author: reimar
Date: Sat May 30 15:18:57 2009
New Revision: 29330

Log:
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 chose because it is less ambiguous and also get_meta_title uses that
(there is no get_meta_name).

Modified:
   trunk/libmpdemux/asfheader.c
   trunk/libmpdemux/aviheader.c
   trunk/libmpdemux/demux_lavf.c
   trunk/libmpdemux/demux_mov.c
   trunk/libmpdemux/demux_ogg.c
   trunk/libmpdemux/demux_real.c
   trunk/libmpdemux/demux_viv.c

Modified: trunk/libmpdemux/asfheader.c
==============================================================================
--- trunk/libmpdemux/asfheader.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/asfheader.c	Sat May 30 15:18:57 2009	(r29330)
@@ -565,7 +565,7 @@ int read_asf_header(demuxer_t *demuxer,s
           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);
           }
         }

Modified: trunk/libmpdemux/aviheader.c
==============================================================================
--- trunk/libmpdemux/aviheader.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/aviheader.c	Sat May 30 15:18:57 2009	(r29330)
@@ -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;

Modified: trunk/libmpdemux/demux_lavf.c
==============================================================================
--- trunk/libmpdemux/demux_lavf.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/demux_lavf.c	Sat May 30 15:18:57 2009	(r29330)
@@ -476,7 +476,7 @@ static demuxer_t* demux_open_lavf(demuxe
         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  );

Modified: trunk/libmpdemux/demux_mov.c
==============================================================================
--- trunk/libmpdemux/demux_mov.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/demux_mov.c	Sat May 30 15:18:57 2009	(r29330)
@@ -1549,7 +1549,7 @@ static void lschunks(demuxer_t* demuxer,
 				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'):

Modified: trunk/libmpdemux/demux_ogg.c
==============================================================================
--- trunk/libmpdemux/demux_ogg.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/demux_ogg.c	Sat May 30 15:18:57 2009	(r29330)
@@ -375,7 +375,7 @@ static void demux_ogg_check_comments(dem
   } table[] = {
     { "ENCODED_USING", "Software" },
     { "ENCODER_URL", "Encoder URL" },
-    { "TITLE", "Name" },
+    { "TITLE", "Title" },
     { "ARTIST", "Artist" },
     { "COMMENT", "Comments" },
     { "DATE", "Creation Date" },

Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/demux_real.c	Sat May 30 15:18:57 2009	(r29330)
@@ -1181,7 +1181,7 @@ static demuxer_t* demux_open_real(demuxe
 		    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);
 		}
 

Modified: trunk/libmpdemux/demux_viv.c
==============================================================================
--- trunk/libmpdemux/demux_viv.c	Sat May 30 15:15:53 2009	(r29329)
+++ trunk/libmpdemux/demux_viv.c	Sat May 30 15:18:57 2009	(r29330)
@@ -208,7 +208,7 @@ static void vivo_parse_text_header(demux
 	/* 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"))