[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[507] mplayerxp

[<nic...@us...>]

Revision: 507
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=507&view=rev
Author:   nickols_k
Date:     2012-12-04 13:56:44 +0000 (Tue, 04 Dec 2012)
Log Message:
-----------
new class Demuxer_Info

Modified Paths:
--------------
    mplayerxp/libmpdemux/Makefile
    mplayerxp/libmpdemux/demux_aiff.cpp
    mplayerxp/libmpdemux/demux_asf.cpp
    mplayerxp/libmpdemux/demux_audio.cpp
    mplayerxp/libmpdemux/demux_avi.cpp
    mplayerxp/libmpdemux/demux_demuxers.cpp
    mplayerxp/libmpdemux/demux_lavf.cpp
    mplayerxp/libmpdemux/demux_mov.cpp
    mplayerxp/libmpdemux/demux_mpxp64.cpp
    mplayerxp/libmpdemux/demux_real.cpp
    mplayerxp/libmpdemux/demux_realaud.cpp
    mplayerxp/libmpdemux/demux_viv.cpp
    mplayerxp/libmpdemux/demux_vqf.cpp
    mplayerxp/libmpdemux/demuxer.cpp
    mplayerxp/libmpdemux/demuxer.h
    mplayerxp/libmpdemux/mux_mpxp64.cpp
    mplayerxp/mplayerxp.cpp

Added Paths:
-----------
    mplayerxp/libmpdemux/demuxer_info.cpp
    mplayerxp/libmpdemux/demuxer_info.h

Modified: mplayerxp/libmpdemux/Makefile
===================================================================
--- mplayerxp/libmpdemux/Makefile	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/Makefile	2012-12-04 13:56:44 UTC (rev 507)
@@ -49,7 +49,7 @@
 CXXSRCS += mux_mpxp64.cpp mux_raw.cpp
 #SRCS+= mux_lavf.c
 
-CXXSRCS+= demuxer.cpp demuxer_packet.cpp demuxer_stream.cpp demuxer_r.cpp
+CXXSRCS+= demuxer.cpp demuxer_info.cpp demuxer_packet.cpp demuxer_stream.cpp demuxer_r.cpp
 CXXSRCS+= muxer.cpp mpdemux.cpp
 
 OBJS	= $(SRCS:.c=.o)

Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_aiff.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -139,7 +139,7 @@
 	char buf[chunk_size+1];
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
-	demux_info_add(demuxer, INFOT_NAME, buf);
+	demuxer->info().add(INFOT_NAME, buf);
 	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else
@@ -148,7 +148,7 @@
 	char buf[chunk_size+1];
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
-	demux_info_add(demuxer, INFOT_AUTHOR, buf);
+	demuxer->info().add(INFOT_AUTHOR, buf);
 	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else
@@ -157,7 +157,7 @@
 	char buf[chunk_size+1];
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
-	demux_info_add(demuxer, INFOT_COPYRIGHT, buf);
+	demuxer->info().add(INFOT_COPYRIGHT, buf);
 	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else
@@ -166,7 +166,7 @@
 	char buf[chunk_size+1];
 	stream_read(s,buf,chunk_size);
 	buf[chunk_size]=0;
-	demux_info_add(demuxer, INFOT_DESCRIPTION, buf);
+	demuxer->info().add(INFOT_DESCRIPTION, buf);
 	if(priv->verc && (chunk_size&1)) stream_read_char(s);
     }
     else

Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_asf.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -248,41 +248,45 @@
 	MSG_V("\n");
 	// extract the title
 	if( apriv->contenth.title_size!=0 ) {
-	  string=(char*)mp_malloc(apriv->contenth.title_size);
-	  stream_read(demuxer->stream, string, apriv->contenth.title_size);
-	  pack_asf_string(string, apriv->contenth.title_size);
-	  demux_info_add(demuxer, INFOT_NAME, string);
+	    string=new char[apriv->contenth.title_size];
+	    stream_read(demuxer->stream, string, apriv->contenth.title_size);
+	    pack_asf_string(string, apriv->contenth.title_size);
+	    demuxer->info().add(INFOT_NAME, string);
+	    delete string;
 	}
 	// extract the author
 	if( apriv->contenth.author_size!=0 ) {
-	  string=(char*)mp_realloc((any_t*)string, apriv->contenth.author_size);
-	  stream_read(demuxer->stream, string, apriv->contenth.author_size);
-	  pack_asf_string(string, apriv->contenth.author_size);
-	  demux_info_add(demuxer, INFOT_AUTHOR, string);
+	    string=new char [apriv->contenth.author_size];
+	    stream_read(demuxer->stream, string, apriv->contenth.author_size);
+	    pack_asf_string(string, apriv->contenth.author_size);
+	    demuxer->info().add(INFOT_AUTHOR, string);
+	    delete string;
 	}
 	// extract the copyright
 	if( apriv->contenth.copyright_size!=0 ) {
-	  string=(char*)mp_realloc((any_t*)string, apriv->contenth.copyright_size);
-	  stream_read(demuxer->stream, string, apriv->contenth.copyright_size);
-	  pack_asf_string(string, apriv->contenth.copyright_size);
-	  demux_info_add(demuxer, INFOT_COPYRIGHT, string);
+	    string=new char [apriv->contenth.copyright_size];
+	    stream_read(demuxer->stream, string, apriv->contenth.copyright_size);
+	    pack_asf_string(string, apriv->contenth.copyright_size);
+	    demuxer->info().add(INFOT_COPYRIGHT, string);
+	    delete string;
 	}
 	// extract the comment
 	if( apriv->contenth.comment_size!=0 ) {
-	  string=(char*)mp_realloc((any_t*)string, apriv->contenth.comment_size);
-	  stream_read(demuxer->stream, string, apriv->contenth.comment_size);
-	  pack_asf_string(string, apriv->contenth.comment_size);
-	  demux_info_add(demuxer, INFOT_COMMENTS, string);
+	    string=new char [apriv->contenth.comment_size];
+	    stream_read(demuxer->stream, string, apriv->contenth.comment_size);
+	    pack_asf_string(string, apriv->contenth.comment_size);
+	    demuxer->info().add(INFOT_COMMENTS, string);
+	    delete string;
 	}
 	// extract the rating
 	if( apriv->contenth.rating_size!=0 ) {
-	  string=(char*)mp_realloc((any_t*)string, apriv->contenth.rating_size);
-	  stream_read(demuxer->stream, string, apriv->contenth.rating_size);
-	  pack_asf_string(string, apriv->contenth.comment_size);
-	  demux_info_add(demuxer, INFOT_RATING, string);
+	    string=new char [apriv->contenth.rating_size];
+	    stream_read(demuxer->stream, string, apriv->contenth.rating_size);
+	    pack_asf_string(string, apriv->contenth.comment_size);
+	    demuxer->info().add(INFOT_RATING, string);
+	    delete string;
 	}
 	MSG_V("\n");
-	delete string;
       break;
     }
     case ASF_GUID_PREFIX_stream_group: {

Modified: mplayerxp/libmpdemux/demux_audio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_audio.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_audio.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -457,26 +457,26 @@
 	demuxer->movi_end = stream_tell(s)-3;
 	stream_read(s,buf,30);
 	buf[30] = '\0';
-	demux_info_add(demuxer,INFOT_NAME,buf);
+	demuxer->info().add(INFOT_NAME,buf);
 	stream_read(s,buf,30);
 	buf[30] = '\0';
-	demux_info_add(demuxer,INFOT_AUTHOR,buf);
+	demuxer->info().add(INFOT_AUTHOR,buf);
 	stream_read(s,buf,30);
 	buf[30] = '\0';
-	demux_info_add(demuxer,INFOT_ALBUM,buf);
+	demuxer->info().add(INFOT_ALBUM,buf);
 	stream_read(s,buf,4);
 	buf[4] = '\0';
-	demux_info_add(demuxer,INFOT_DATE,buf);
+	demuxer->info().add(INFOT_DATE,buf);
 	stream_read(s,buf,30);
 	buf[30] = '\0';
-	demux_info_add(demuxer,INFOT_COMMENTS,buf);
+	demuxer->info().add(INFOT_COMMENTS,buf);
 	if(buf[28] == 0 && buf[29] != 0) {
 	  uint8_t trk = (uint8_t)buf[29];
 	  sprintf(buf,"%d",trk);
-	  demux_info_add(demuxer,INFOT_TRACK,buf);
+	  demuxer->info().add(INFOT_TRACK,buf);
 	}
 	g = stream_read_char(s);
-	demux_info_add(demuxer,INFOT_GENRE,genres[g]);
+	demuxer->info().add(INFOT_GENRE,genres[g]);
       }
     }
     return 1;
@@ -567,21 +567,21 @@
 	data[std::min(len,unsigned(4096))]=0;
 	switch(id)
 	{
-	    case mmioFOURCC(0,'T','T','1'): if(len>1) demux_info_add(demuxer,INFOT_DESCRIPTION,data+1); break;
-	    case mmioFOURCC(0,'T','T','2'): if(len>1) demux_info_add(demuxer,INFOT_NAME,data+1); break;
-	    case mmioFOURCC(0,'T','T','3'): if(len>1) demux_info_add(demuxer,INFOT_SUBJECT,data+1); break;
-	    case mmioFOURCC(0,'C','O','M'): if(len>4) demux_info_add(demuxer,INFOT_COMMENTS,data+4); break;
-	    case mmioFOURCC(0,'T','C','O'): if(len>1) demux_info_add(demuxer,INFOT_GENRE,genres[data[1]]); break;
-	    case mmioFOURCC(0,'T','C','R'): if(len>1) demux_info_add(demuxer,INFOT_COPYRIGHT,genres[data[1]]); break;
-	    case mmioFOURCC(0,'T','P','1'): if(len>1) demux_info_add(demuxer,INFOT_AUTHOR,data+1); break;
-	    case mmioFOURCC(0,'T','A','L'): if(len>1) demux_info_add(demuxer,INFOT_ALBUM,data+1); break;
-	    case mmioFOURCC(0,'T','R','K'): if(len>1) demux_info_add(demuxer,INFOT_TRACK,data+1); break;
-	    case mmioFOURCC(0,'T','Y','E'): if(len>1) demux_info_add(demuxer,INFOT_DATE,data+1); break;
-	    case mmioFOURCC(0,'T','E','N'): if(len>1) demux_info_add(demuxer,INFOT_ENCODER,data+1); break;
-	    case mmioFOURCC(0,'T','M','T'): if(len>1) demux_info_add(demuxer,INFOT_SOURCE_MEDIA,data+1); break;
-	    case mmioFOURCC(0,'T','F','T'): if(len>1) demux_info_add(demuxer,INFOT_MIME,data+1); break;
-	    case mmioFOURCC(0,'P','O','P'): if(len>1) demux_info_add(demuxer,INFOT_RATING,data+1); break;
-	    case mmioFOURCC(0,'W','X','X'): if(len>1) demux_info_add(demuxer,INFOT_WWW,data+1); break;
+	    case mmioFOURCC(0,'T','T','1'): if(len>1) demuxer->info().add(INFOT_DESCRIPTION,data+1); break;
+	    case mmioFOURCC(0,'T','T','2'): if(len>1) demuxer->info().add(INFOT_NAME,data+1); break;
+	    case mmioFOURCC(0,'T','T','3'): if(len>1) demuxer->info().add(INFOT_SUBJECT,data+1); break;
+	    case mmioFOURCC(0,'C','O','M'): if(len>4) demuxer->info().add(INFOT_COMMENTS,data+4); break;
+	    case mmioFOURCC(0,'T','C','O'): if(len>1) demuxer->info().add(INFOT_GENRE,genres[data[1]]); break;
+	    case mmioFOURCC(0,'T','C','R'): if(len>1) demuxer->info().add(INFOT_COPYRIGHT,genres[data[1]]); break;
+	    case mmioFOURCC(0,'T','P','1'): if(len>1) demuxer->info().add(INFOT_AUTHOR,data+1); break;
+	    case mmioFOURCC(0,'T','A','L'): if(len>1) demuxer->info().add(INFOT_ALBUM,data+1); break;
+	    case mmioFOURCC(0,'T','R','K'): if(len>1) demuxer->info().add(INFOT_TRACK,data+1); break;
+	    case mmioFOURCC(0,'T','Y','E'): if(len>1) demuxer->info().add(INFOT_DATE,data+1); break;
+	    case mmioFOURCC(0,'T','E','N'): if(len>1) demuxer->info().add(INFOT_ENCODER,data+1); break;
+	    case mmioFOURCC(0,'T','M','T'): if(len>1) demuxer->info().add(INFOT_SOURCE_MEDIA,data+1); break;
+	    case mmioFOURCC(0,'T','F','T'): if(len>1) demuxer->info().add(INFOT_MIME,data+1); break;
+	    case mmioFOURCC(0,'P','O','P'): if(len>1) demuxer->info().add(INFOT_RATING,data+1); break;
+	    case mmioFOURCC(0,'W','X','X'): if(len>1) demuxer->info().add(INFOT_WWW,data+1); break;
 	    case 0: goto end;
 	    default: MSG_WARN("Unhandled frame: %3s\n",buf); break;
 	}
@@ -640,21 +640,21 @@
 	MSG_V("ID3: %4s len %u\n",buf,len);
 	switch(id)
 	{
-	    case mmioFOURCC('T','I','T','1'): if(len>1) demux_info_add(demuxer,INFOT_DESCRIPTION,data+1); break;
-	    case mmioFOURCC('T','I','T','2'): if(len>1) demux_info_add(demuxer,INFOT_NAME,data+1); break;
-	    case mmioFOURCC('T','I','T','3'): if(len>1) demux_info_add(demuxer,INFOT_SUBJECT,data+1); break;
-	    case mmioFOURCC('C','O','M','M'): if(len>4) demux_info_add(demuxer,INFOT_COMMENTS,data+4); break;
-	    case mmioFOURCC('T','C','O','N'): if(len>1) demux_info_add(demuxer,INFOT_GENRE,genres[data[1]]); break;
-	    case mmioFOURCC('T','P','E','1'): if(len>1) demux_info_add(demuxer,INFOT_AUTHOR,data+1); break;
-	    case mmioFOURCC('T','A','L','B'): if(len>1) demux_info_add(demuxer,INFOT_ALBUM,data+1); break;
-	    case mmioFOURCC('T','R','C','K'): if(len>1) demux_info_add(demuxer,INFOT_TRACK,data+1); break;
-	    case mmioFOURCC('T','Y','E','R'): if(len>1) demux_info_add(demuxer,INFOT_DATE,data+1); break;
-	    case mmioFOURCC('T','E','N','C'): if(len>1) demux_info_add(demuxer,INFOT_ENCODER,data+1); break;
-	    case mmioFOURCC('T','C','O','P'): if(len>1) demux_info_add(demuxer,INFOT_COPYRIGHT,data+1); break;
-	    case mmioFOURCC('T','M','E','D'): if(len>1) demux_info_add(demuxer,INFOT_SOURCE_MEDIA,data+1); break;
-	    case mmioFOURCC('T','F','L','T'): if(len>1) demux_info_add(demuxer,INFOT_MIME,data+1); break;
-	    case mmioFOURCC('P','O','P','M'): if(len>1) demux_info_add(demuxer,INFOT_RATING,data+1); break;
-	    case mmioFOURCC('W','X','X','X'): if(len>1) demux_info_add(demuxer,INFOT_WWW,data+1); break;
+	    case mmioFOURCC('T','I','T','1'): if(len>1) demuxer->info().add(INFOT_DESCRIPTION,data+1); break;
+	    case mmioFOURCC('T','I','T','2'): if(len>1) demuxer->info().add(INFOT_NAME,data+1); break;
+	    case mmioFOURCC('T','I','T','3'): if(len>1) demuxer->info().add(INFOT_SUBJECT,data+1); break;
+	    case mmioFOURCC('C','O','M','M'): if(len>4) demuxer->info().add(INFOT_COMMENTS,data+4); break;
+	    case mmioFOURCC('T','C','O','N'): if(len>1) demuxer->info().add(INFOT_GENRE,genres[data[1]]); break;
+	    case mmioFOURCC('T','P','E','1'): if(len>1) demuxer->info().add(INFOT_AUTHOR,data+1); break;
+	    case mmioFOURCC('T','A','L','B'): if(len>1) demuxer->info().add(INFOT_ALBUM,data+1); break;
+	    case mmioFOURCC('T','R','C','K'): if(len>1) demuxer->info().add(INFOT_TRACK,data+1); break;
+	    case mmioFOURCC('T','Y','E','R'): if(len>1) demuxer->info().add(INFOT_DATE,data+1); break;
+	    case mmioFOURCC('T','E','N','C'): if(len>1) demuxer->info().add(INFOT_ENCODER,data+1); break;
+	    case mmioFOURCC('T','C','O','P'): if(len>1) demuxer->info().add(INFOT_COPYRIGHT,data+1); break;
+	    case mmioFOURCC('T','M','E','D'): if(len>1) demuxer->info().add(INFOT_SOURCE_MEDIA,data+1); break;
+	    case mmioFOURCC('T','F','L','T'): if(len>1) demuxer->info().add(INFOT_MIME,data+1); break;
+	    case mmioFOURCC('P','O','P','M'): if(len>1) demuxer->info().add(INFOT_RATING,data+1); break;
+	    case mmioFOURCC('W','X','X','X'): if(len>1) demuxer->info().add(INFOT_WWW,data+1); break;
 	    case 0: goto end;
 	    default: MSG_V("Unhandled frame: %4s\n",buf); break;
 	}
@@ -717,21 +717,21 @@
 	switch(id)
 	{
 	    /* first byte of data indicates encoding type: 0-ASCII (1-2)-UTF16(LE,BE) 3-UTF8 */
-	    case mmioFOURCC('T','I','T','1'): if(len>1) demux_info_add(demuxer,INFOT_DESCRIPTION,data+1); break;
-	    case mmioFOURCC('T','I','T','2'): if(len>1) demux_info_add(demuxer,INFOT_NAME,data+1); break;
-	    case mmioFOURCC('T','I','T','3'): if(len>1) demux_info_add(demuxer,INFOT_SUBJECT,data+1); break;
-	    case mmioFOURCC('C','O','M','M'): if(len>4) demux_info_add(demuxer,INFOT_COMMENTS,data+4); break;
-	    case mmioFOURCC('T','C','O','N'): if(len>1) demux_info_add(demuxer,INFOT_GENRE,genres[data[1]]); break;
-	    case mmioFOURCC('T','P','E','1'): if(len>1) demux_info_add(demuxer,INFOT_AUTHOR,data+1); break;
-	    case mmioFOURCC('T','A','L','B'): if(len>1) demux_info_add(demuxer,INFOT_ALBUM,data+1); break;
-	    case mmioFOURCC('T','R','C','K'): if(len>1) demux_info_add(demuxer,INFOT_TRACK,data+1); break;
-/*!*/	    case mmioFOURCC('T','D','R','C'): if(len>1) demux_info_add(demuxer,INFOT_DATE,data+1); break;
-	    case mmioFOURCC('T','E','N','C'): if(len>1) demux_info_add(demuxer,INFOT_ENCODER,data+1); break;
-	    case mmioFOURCC('T','C','O','P'): if(len>1) demux_info_add(demuxer,INFOT_COPYRIGHT,data+1); break;
-	    case mmioFOURCC('T','M','E','D'): if(len>1) demux_info_add(demuxer,INFOT_SOURCE_MEDIA,data+1); break;
-	    case mmioFOURCC('T','F','L','T'): if(len>1) demux_info_add(demuxer,INFOT_MIME,data+1); break;
-	    case mmioFOURCC('P','O','P','M'): if(len>1) demux_info_add(demuxer,INFOT_RATING,data+1); break;
-	    case mmioFOURCC('W','X','X','X'): if(len>1) demux_info_add(demuxer,INFOT_WWW,data+1); break;
+	    case mmioFOURCC('T','I','T','1'): if(len>1) demuxer->info().add(INFOT_DESCRIPTION,data+1); break;
+	    case mmioFOURCC('T','I','T','2'): if(len>1) demuxer->info().add(INFOT_NAME,data+1); break;
+	    case mmioFOURCC('T','I','T','3'): if(len>1) demuxer->info().add(INFOT_SUBJECT,data+1); break;
+	    case mmioFOURCC('C','O','M','M'): if(len>4) demuxer->info().add(INFOT_COMMENTS,data+4); break;
+	    case mmioFOURCC('T','C','O','N'): if(len>1) demuxer->info().add(INFOT_GENRE,genres[data[1]]); break;
+	    case mmioFOURCC('T','P','E','1'): if(len>1) demuxer->info().add(INFOT_AUTHOR,data+1); break;
+	    case mmioFOURCC('T','A','L','B'): if(len>1) demuxer->info().add(INFOT_ALBUM,data+1); break;
+	    case mmioFOURCC('T','R','C','K'): if(len>1) demuxer->info().add(INFOT_TRACK,data+1); break;
+/*!*/	    case mmioFOURCC('T','D','R','C'): if(len>1) demuxer->info().add(INFOT_DATE,data+1); break;
+	    case mmioFOURCC('T','E','N','C'): if(len>1) demuxer->info().add(INFOT_ENCODER,data+1); break;
+	    case mmioFOURCC('T','C','O','P'): if(len>1) demuxer->info().add(INFOT_COPYRIGHT,data+1); break;
+	    case mmioFOURCC('T','M','E','D'): if(len>1) demuxer->info().add(INFOT_SOURCE_MEDIA,data+1); break;
+	    case mmioFOURCC('T','F','L','T'): if(len>1) demuxer->info().add(INFOT_MIME,data+1); break;
+	    case mmioFOURCC('P','O','P','M'): if(len>1) demuxer->info().add(INFOT_RATING,data+1); break;
+	    case mmioFOURCC('W','X','X','X'): if(len>1) demuxer->info().add(INFOT_WWW,data+1); break;
 	    case 0: goto end;
 	    default: MSG_V("Unhandled frame: %4s\n",buf); break;
 	}
@@ -1260,7 +1260,7 @@
 			stream_read(s,note,rlen);
 			note[rlen]=0;
 			if(slen>rlen) stream_skip(s,slen-rlen);
-			demux_info_add(demuxer,INFOT_NAME,note);
+			demuxer->info().add(INFOT_NAME,note);
 			MSG_DBG2("RIFF 'labl' %u %s accepted\n",slen,note);
 		    }
 		    else
@@ -1271,7 +1271,7 @@
 			stream_read(s,note,rlen);
 			note[rlen]=0;
 			if(slen>rlen) stream_skip(s,slen-rlen);
-			demux_info_add(demuxer,INFOT_COMMENTS,note);
+			demuxer->info().add(INFOT_COMMENTS,note);
 			MSG_DBG2("RIFF 'note' %u %s accepted\n",slen,note);
 		    }
 		    else stream_skip(s,subchunk_size);

Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_avi.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -477,7 +477,7 @@
       chunksize-=len;
       buf[len]=0;
       MSG_V("%-10s: %s\n",hdr,buf);
-      if(infot!=-1) demux_info_add(demuxer, infot, buf);
+      if(infot!=-1) demuxer->info().add(infot, buf);
       else	    MSG_V("   %s: %s\n",hdr,buf);
     }
   }

Modified: mplayerxp/libmpdemux/demux_demuxers.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_demuxers.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_demuxers.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -98,6 +98,5 @@
   dd_priv_t* priv = static_cast<dd_priv_t*>(demuxer->priv);
 
   delete priv;
-  demux_info_free(demuxer);
   delete demuxer;
 }

Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_lavf.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -262,14 +262,14 @@
 
     AVDictionaryEntry *tag = NULL;
     while((tag = av_dict_get(avfc->metadata, "", tag, AV_DICT_IGNORE_SUFFIX))) {
-	if(strcmp(tag->key,"title")==0)    demux_info_add(demuxer,INFOT_NAME,tag->value);
-	else if(strcmp(tag->key,"author")==0)demux_info_add(demuxer,INFOT_AUTHOR,tag->value);
-	else if(strcmp(tag->key,"copyright")==0)demux_info_add(demuxer,INFOT_COPYRIGHT,tag->value);
-	else if(strcmp(tag->key,"comment")==0) demux_info_add(demuxer,INFOT_COMMENTS,tag->value);
-	else if(strcmp(tag->key,"album")==0) demux_info_add(demuxer,INFOT_ALBUM,tag->value);
-	else if(strcmp(tag->key,"genre")==0) demux_info_add(demuxer,INFOT_GENRE,tag->value);
-	else if(strcmp(tag->key,"track")==0) demux_info_add(demuxer,INFOT_TRACK,tag->value);
-	else if(strcmp(tag->key,"date")==0) demux_info_add(demuxer,INFOT_DATE,tag->value);
+	if(strcmp(tag->key,"title")==0)    demuxer->info().add(INFOT_NAME,tag->value);
+	else if(strcmp(tag->key,"author")==0)demuxer->info().add(INFOT_AUTHOR,tag->value);
+	else if(strcmp(tag->key,"copyright")==0)demuxer->info().add(INFOT_COPYRIGHT,tag->value);
+	else if(strcmp(tag->key,"comment")==0) demuxer->info().add(INFOT_COMMENTS,tag->value);
+	else if(strcmp(tag->key,"album")==0) demuxer->info().add(INFOT_ALBUM,tag->value);
+	else if(strcmp(tag->key,"genre")==0) demuxer->info().add(INFOT_GENRE,tag->value);
+	else if(strcmp(tag->key,"track")==0) demuxer->info().add(INFOT_TRACK,tag->value);
+	else if(strcmp(tag->key,"date")==0) demuxer->info().add(INFOT_DATE,tag->value);
     }
 
     for(j=0; j<avfc->nb_streams; j++){

Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_mov.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -1410,17 +1410,17 @@
 			switch(udta_id)
 			{
 			    case MOV_FOURCC(0xa9,'a','u','t'):
-				demux_info_add(demuxer, INFOT_AUTHOR, &text[2]);
+				demuxer->info().add( INFOT_AUTHOR, &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'c','p','y'):
-				demux_info_add(demuxer, INFOT_COPYRIGHT, &text[2]);
+				demuxer->info().add( INFOT_COPYRIGHT, &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'i','n','f'):
-				demux_info_add(demuxer, INFOT_DESCRIPTION, &text[2]);
+				demuxer->info().add( INFOT_DESCRIPTION, &text[2]);
 				break;
 			    case MOV_FOURCC('n','a','m','e'):
 			    case MOV_FOURCC(0xa9,'n','a','m'):
-				demux_info_add(demuxer, INFOT_NAME, &text[2]);
+				demuxer->info().add( INFOT_NAME, &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'A','R','T'):
 				MSG_V(" Artist: %s\n", &text[2]);
@@ -1429,16 +1429,16 @@
 				MSG_V(" Director: %s\n", &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'c','m','t'):
-				demux_info_add(demuxer, INFOT_COMMENTS, &text[2]);
+				demuxer->info().add( INFOT_COMMENTS, &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'r','e','q'):
 				MSG_V(" Requirements: %s\n", &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'s','w','r'):
-				demux_info_add(demuxer, INFOT_ENCODER, &text[2]);
+				demuxer->info().add( INFOT_ENCODER, &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'d','a','y'):
-				demux_info_add(demuxer, INFOT_DATE, &text[2]);
+				demuxer->info().add( INFOT_DATE, &text[2]);
 				break;
 			    case MOV_FOURCC(0xa9,'f','m','t'):
 				MSG_V(" Format: %s\n", &text[2]);

Modified: mplayerxp/libmpdemux/demux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mpxp64.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_mpxp64.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -411,7 +411,7 @@
 	    str=new char [len];
 	    stream_read(s,str,len);
 	    sub_data.cp=nls_get_screen_cp();
-	    demux_info_add(demuxer,infot,nls_recode2screen_cp(codepage,str,len));
+	    demuxer->info().add(infot,nls_recode2screen_cp(codepage,str,len));
 	    delete str;
 	}
 	else stream_skip(s,len);

Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_real.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -885,7 +885,7 @@
 		    buf = new char [len+1];
 		    stream_read(demuxer->stream, buf, len);
 		    buf[len] = 0;
-		    demux_info_add(demuxer, INFOT_NAME, buf);
+		    demuxer->info().add( INFOT_NAME, buf);
 		    delete buf;
 		}
 
@@ -895,7 +895,7 @@
 		    buf = new char [len+1];
 		    stream_read(demuxer->stream, buf, len);
 		    buf[len] = 0;
-		    demux_info_add(demuxer, INFOT_AUTHOR, buf);
+		    demuxer->info().add( INFOT_AUTHOR, buf);
 		    delete buf;
 		}
 
@@ -905,7 +905,7 @@
 		    buf = new char [len+1];
 		    stream_read(demuxer->stream, buf, len);
 		    buf[len] = 0;
-		    demux_info_add(demuxer, INFOT_COPYRIGHT, buf);
+		    demuxer->info().add( INFOT_COPYRIGHT, buf);
 		    delete buf;
 		}
 
@@ -915,7 +915,7 @@
 		    buf = new char [len+1];
 		    stream_read(demuxer->stream, buf, len);
 		    buf[len] = 0;
-		    demux_info_add(demuxer, INFOT_COMMENTS, buf);
+		    demuxer->info().add( INFOT_COMMENTS, buf);
 		    delete buf;
 		}
 		break;
@@ -944,13 +944,13 @@
 		tmp=stream_read_char(demuxer->stream);
 		stream_read(demuxer->stream,tmps,tmp);
 		tmps[tmp]=0;
-		if(!demux_info_get(demuxer, INFOT_DESCRIPTION))
-		    demux_info_add(demuxer, INFOT_DESCRIPTION, tmps);
+		if(!demuxer->info().get(INFOT_DESCRIPTION))
+		    demuxer->info().add( INFOT_DESCRIPTION, tmps);
 		tmp=stream_read_char(demuxer->stream);
 		stream_read(demuxer->stream,tmps,tmp);
 		tmps[tmp]=0;
-		if(!demux_info_get(demuxer, INFOT_MIME))
-		    demux_info_add(demuxer, INFOT_MIME, tmps);
+		if(!demuxer->info().get(INFOT_MIME))
+		    demuxer->info().add( INFOT_MIME, tmps);
 
 		/* Type specific header */
 		codec_data_size = stream_read_dword(demuxer->stream);
@@ -1002,21 +1002,21 @@
 		      buft = new char [i+1];
 		      stream_read(demuxer->stream, buft, i);
 		      buft[i] = 0;
-		      demux_info_add(demuxer, INFOT_NAME, buft);
+		      demuxer->info().add( INFOT_NAME, buft);
 		      delete buft;
 		    }
 		    if ((i = stream_read_char(demuxer->stream)) != 0) {
 		      buft = new char [i+1];
 		      stream_read(demuxer->stream, buft, i);
 		      buft[i] = 0;
-		      demux_info_add(demuxer, INFOT_AUTHOR, buft);
+		      demuxer->info().add( INFOT_AUTHOR, buft);
 		      delete buft;
 		    }
 		    if ((i = stream_read_char(demuxer->stream)) != 0) {
 		      buft = new char [i+1];
 		      stream_read(demuxer->stream, buft, i);
 		      buft[i] = 0;
-		      demux_info_add(demuxer, INFOT_COPYRIGHT, buft);
+		      demuxer->info().add( INFOT_COPYRIGHT, buft);
 		      delete buft;
 		    }
 		    if ((i = stream_read_char(demuxer->stream)) != 0)

Modified: mplayerxp/libmpdemux/demux_realaud.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_realaud.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_realaud.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -167,28 +167,28 @@
 		buf = new char [i+1];
 		stream_read(demuxer->stream, buf, i);
 		buf[i] = 0;
-		demux_info_add(demuxer, INFOT_NAME, buf);
+		demuxer->info().add( INFOT_NAME, buf);
 		delete buf;
 	}
 	if ((i = stream_read_char(demuxer->stream)) != 0) {
 		buf = new char [i+1];
 		stream_read(demuxer->stream, buf, i);
 		buf[i] = 0;
-		demux_info_add(demuxer, INFOT_AUTHOR, buf);
+		demuxer->info().add( INFOT_AUTHOR, buf);
 		delete buf;
 	}
 	if ((i = stream_read_char(demuxer->stream)) != 0) {
 		buf = new char [i+1];
 		stream_read(demuxer->stream, buf, i);
 		buf[i] = 0;
-		demux_info_add(demuxer, INFOT_COPYRIGHT, buf);
+		demuxer->info().add( INFOT_COPYRIGHT, buf);
 		delete buf;
 	}
 	if ((i = stream_read_char(demuxer->stream)) != 0) {
 		buf = new char [i+1];
 		stream_read(demuxer->stream, buf, i);
 		buf[i] = 0;
-		demux_info_add(demuxer, INFOT_COMMENTS, buf);
+		demuxer->info().add( INFOT_COMMENTS, buf);
 		delete buf;
 	}
 

Modified: mplayerxp/libmpdemux/demux_viv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_viv.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_viv.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -242,22 +242,22 @@
 	/* only for displaying some informations about movie*/
 	if (!strcmp(opt, "Title"))
 	{
-	    demux_info_add(demux, INFOT_NAME, param);
+	    demux->info().add( INFOT_NAME, param);
 	    priv->title = mp_strdup(param);
 	}
 	if (!strcmp(opt, "Author"))
 	{
-	    demux_info_add(demux, INFOT_AUTHOR, param);
+	    demux->info().add( INFOT_AUTHOR, param);
 	    priv->author = mp_strdup(param);
 	}
 	if (!strcmp(opt, "Copyright"))
 	{
-	    demux_info_add(demux, INFOT_COPYRIGHT, param);
+	    demux->info().add( INFOT_COPYRIGHT, param);
 	    priv->copyright = mp_strdup(param);
 	}
 	if (!strcmp(opt, "Producer"))
 	{
-	    demux_info_add(demux, INFOT_ENCODER, param);
+	    demux->info().add( INFOT_ENCODER, param);
 	    priv->producer = mp_strdup(param);
 	}
 

Modified: mplayerxp/libmpdemux/demux_vqf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demux_vqf.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -126,25 +126,25 @@
 	    if(sid==mmioFOURCC('N','A','M','E'))
 	    {
 		memcpy(hi->Name,sdata,std::min(unsigned(BUFSIZ),slen));
-		demux_info_add(demuxer,INFOT_NAME,sdata);
+		demuxer->info().add(INFOT_NAME,sdata);
 	    }
 	    else
 	    if(sid==mmioFOURCC('A','U','T','H'))
 	    {
 		memcpy(hi->Auth,sdata,std::min(unsigned(BUFSIZ),slen));
-		demux_info_add(demuxer,INFOT_AUTHOR,sdata);
+		demuxer->info().add(INFOT_AUTHOR,sdata);
 	    }
 	    else
 	    if(sid==mmioFOURCC('C','O','M','T'))
 	    {
 		memcpy(hi->Comt,sdata,std::min(unsigned(BUFSIZ),slen));
-		demux_info_add(demuxer,INFOT_COMMENTS,sdata);
+		demuxer->info().add(INFOT_COMMENTS,sdata);
 	    }
 	    else
 	    if(sid==mmioFOURCC('(','c',')',' '))
 	    {
 		memcpy(hi->Cpyr,sdata,std::min(unsigned(BUFSIZ),slen));
-		demux_info_add(demuxer,INFOT_COPYRIGHT,sdata);
+		demuxer->info().add(INFOT_COPYRIGHT,sdata);
 	    }
 	    else
 	    if(sid==mmioFOURCC('F','I','L','E'))
@@ -152,13 +152,13 @@
 		memcpy(hi->File,sdata,std::min(unsigned(BUFSIZ),slen));
 	    }
 	    else
-	    if(sid==mmioFOURCC('A','L','B','M')) demux_info_add(demuxer,INFOT_ALBUM,sdata);
+	    if(sid==mmioFOURCC('A','L','B','M')) demuxer->info().add(INFOT_ALBUM,sdata);
 	    else
-	    if(sid==mmioFOURCC('Y','E','A','R')) demux_info_add(demuxer,INFOT_DATE,sdata);
+	    if(sid==mmioFOURCC('Y','E','A','R')) demuxer->info().add(INFOT_DATE,sdata);
 	    else
-	    if(sid==mmioFOURCC('T','R','A','C')) demux_info_add(demuxer,INFOT_TRACK,sdata);
+	    if(sid==mmioFOURCC('T','R','A','C')) demuxer->info().add(INFOT_TRACK,sdata);
 	    else
-	    if(sid==mmioFOURCC('E','N','C','D')) demux_info_add(demuxer,INFOT_ENCODER,sdata);
+	    if(sid==mmioFOURCC('E','N','C','D')) demuxer->info().add(INFOT_ENCODER,sdata);
 	    else
 	    MSG_V("Unhandled subchunk '%c%c%c%c'='%s'\n",((char *)&sid)[0],((char *)&sid)[1],((char *)&sid)[2],((char *)&sid)[3],sdata);
 	    /* other stuff is unrecognized due untranslatable japan's idiomatics */

Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demuxer.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -15,8 +15,6 @@
 #include "libmpsub/subreader.h"
 #include "libmpconf/cfgparser.h"
 
-#include "nls/nls.h"
-
 #include "osdep/fastmemcpy.h"
 #include "libvo/sub.h"
 #include "libao2/afmt.h"
@@ -92,10 +90,6 @@
     NULL
 };
 
-struct demuxer_info_t {
-    char *id[INFOT_MAX];
-};
-
 void libmpdemux_register_options(m_config_t* cfg)
 {
     unsigned i;
@@ -120,12 +114,18 @@
   d->audio=new(zeromem) Demuxer_Stream(d,a_id);
   d->video=new(zeromem) Demuxer_Stream(d,v_id);
   d->sub=new(zeromem) Demuxer_Stream(d,s_id);
-  d->info=new(zeromem) demuxer_info_t;
   stream_reset(stream);
   stream_seek(stream,stream->start_pos);
   return d;
 }
 
+demuxer_t::demuxer_t()
+	:_info(new(zeromem) Demuxer_Info)
+{
+}
+
+demuxer_t::~demuxer_t() {}
+
 sh_audio_t *get_sh_audio(demuxer_t *demuxer, int id)
 {
     if(id > MAX_A_STREAMS-1 || id < 0) {
@@ -216,7 +216,6 @@
 	delete demuxer->audio; demuxer->audio=NULL;
 	delete demuxer->video; demuxer->video=NULL;
 	delete demuxer->sub; demuxer->sub=NULL;
-	demux_info_free(demuxer);
 	delete demuxer;
     }
 }
@@ -320,10 +319,10 @@
     demuxer=new_demux;
     MSG_OK("Using: %s\n",demuxer->driver->name);
     for(i=0;i<sizeof(stream_txt_ids)/sizeof(struct s_stream_txt_ids);i++)
-    if(!demux_info_get(demuxer,stream_txt_ids[i].demuxer_id)) {
+    if(!demuxer->info().get(stream_txt_ids[i].demuxer_id)) {
 	char stream_name[256];
 	if(stream_control(demuxer->stream,stream_txt_ids[i].stream_id,stream_name) == MPXP_Ok) {
-		demux_info_add(demuxer,stream_txt_ids[i].demuxer_id,stream_name);
+		demuxer->info().add(stream_txt_ids[i].demuxer_id,stream_name);
 	}
     }
     stream->demuxer=demuxer;
@@ -412,72 +411,6 @@
     return 1;
 }
 
-static const char *info_names[INFOT_MAX] =
-{
-    "Author",
-    "Name",
-    "Subject",
-    "Copyright",
-    "Description",
-    "Album",
-    "Date",
-    "Track",
-    "Genre",
-    "Encoder",
-    "SrcMedia",
-    "WWW",
-    "Mail",
-    "Rating",
-    "Comments",
-    "Mime"
-};
-
-int demux_info_add(demuxer_t *demuxer, unsigned opt, const char *param)
-{
-    if(!opt || opt > INFOT_MAX)
-    {
-	MSG_WARN("Unknown info type %u\n",opt);
-	return 0;
-    }
-    opt--;
-    check_pin("demuxer",demuxer->pin,DEMUX_PIN);
-    if(demuxer->info->id[opt])
-    {
-	MSG_V( "Demuxer info '%s' already present as '%s'!\n",info_names[opt],demuxer->info->id[opt]);
-	delete demuxer->info->id[opt];
-    }
-    demuxer->info->id[opt]=nls_recode2screen_cp(sub_data.cp,param,strlen(param));
-    return 1;
-}
-
-int demux_info_print(const demuxer_t *demuxer,const char *filename)
-{
-    unsigned i;
-    MSG_HINT(" CLIP INFO (%s):\n",filename);
-    for(i=0;i<INFOT_MAX;i++)
-	if(demuxer->info->id[i])
-	    MSG_HINT("   %s: %s\n",info_names[i],demuxer->info->id[i]);
-    return 0;
-}
-
-void demux_info_free(demuxer_t* demuxer)
-{
-    unsigned i;
-    if(demuxer->info)
-    {
-	demuxer_info_t*dinfo = demuxer->info;
-	for(i=0;i<INFOT_MAX;i++)
-	    if(dinfo->id[i])
-		delete dinfo->id[i];
-	delete dinfo;
-    }
-}
-
-const char* demux_info_get(const demuxer_t *demuxer, unsigned opt) {
-    if(!opt || opt > INFOT_MAX) return NULL;
-    return demuxer->info->id[opt-1];
-}
-
 /******************* Options stuff **********************/
 
 static const config_t demux_opts[] = {

Modified: mplayerxp/libmpdemux/demuxer.h
===================================================================
--- mplayerxp/libmpdemux/demuxer.h	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/demuxer.h	2012-12-04 13:56:44 UTC (rev 507)
@@ -5,6 +5,7 @@
 #include "libmpconf/cfgparser.h"
 #include "demuxer_packet.h"
 #include "demuxer_stream.h"
+#include "demuxer_info.h"
 
 #define MAX_PACK_BYTES (0x1024*0x1024*4)
 enum {
@@ -69,13 +70,14 @@
     DEMUX_PIN=RND_NUMBER2+RND_CHAR2
 };
 
-struct demuxer_info_t;
 struct demuxer_driver_t;
 struct demuxer_t : public Opaque {
     public:
-	demuxer_t() {}
-	virtual ~demuxer_t() {}
+	demuxer_t();
+	virtual ~demuxer_t();
 
+	Demuxer_Info&	info() const { return *_info; }
+
 	char		antiviral_hole[RND_CHAR3];
 	unsigned	pin;		/**< personal identification number */
 	stream_t*	stream;		/**< stream for movie reading */
@@ -94,9 +96,10 @@
 	int		synced;		/**< indicates stream synchronisation. TODO: mpg->priv */
 
 	Opaque*		priv;		/**< private data of demuxer's driver.*/
-	demuxer_info_t*	info;		/**< human-readable info from stream/movie (like movie name,author,duration)*/
 	const demuxer_driver_t* driver;	/**< driver associated with this demuxer */
-} __attribute__ ((packed));
+    private:
+	LocalPtr<Demuxer_Info>	_info;	/**< human-readable info from stream/movie (like movie name,author,duration)*/
+};
 
 enum {
     DEMUX_SEEK_CUR	=0x00,
@@ -129,30 +132,6 @@
 
 /* AVI demuxer params: */
 extern int index_mode;  /**< -1=untouched  0=don't use index  1=use (geneate) index */
-enum {
-    INFOT_NULL		=0,
-    INFOT_AUTHOR	=1,
-    INFOT_NAME		=2,
-    INFOT_SUBJECT	=3,
-    INFOT_COPYRIGHT	=4,
-    INFOT_DESCRIPTION	=5,
-    INFOT_ALBUM		=6,
-    INFOT_DATE		=7,
-    INFOT_TRACK		=8,
-    INFOT_GENRE		=9,
-    INFOT_ENCODER	=10,
-    INFOT_SOURCE_MEDIA	=11,
-    INFOT_WWW		=12,
-    INFOT_MAIL		=13,
-    INFOT_RATING	=14,
-    INFOT_COMMENTS	=15,
-    INFOT_MIME		=16,
-    INFOT_MAX		=16
-};
-int demux_info_add(demuxer_t *demuxer, unsigned opt, const char *param);
-const char* demux_info_get(const demuxer_t *demuxer, unsigned opt);
-int demux_info_print(const demuxer_t *demuxer,const char *filename);
-void demux_info_free(demuxer_t *demuxer);
 
 extern int demuxer_switch_audio(const demuxer_t *, int id);
 extern int demuxer_switch_video(const demuxer_t *, int id);

Added: mplayerxp/libmpdemux/demuxer_info.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_info.cpp	                        (rev 0)
+++ mplayerxp/libmpdemux/demuxer_info.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -0,0 +1,66 @@
+#include "demuxer_info.h"
+
+#include "nls/nls.h"
+
+#include "demux_msg.h"
+
+
+namespace mpxp {
+static const char *info_names[INFOT_MAX] =
+{
+    "Author",
+    "Name",
+    "Subject",
+    "Copyright",
+    "Description",
+    "Album",
+    "Date",
+    "Track",
+    "Genre",
+    "Encoder",
+    "SrcMedia",
+    "WWW",
+    "Mail",
+    "Rating",
+    "Comments",
+    "Mime"
+};
+
+Demuxer_Info::Demuxer_Info() {}
+Demuxer_Info::~Demuxer_Info() {
+    unsigned i;
+    for(i=0;i<INFOT_MAX;i++)
+	if(id[i])
+	    delete id[i];
+}
+
+MPXP_Rc Demuxer_Info::add(unsigned opt, const char *param)
+{
+    if(!opt || opt > INFOT_MAX) {
+	MSG_WARN("Unknown info type %u\n",opt);
+	return MPXP_False;
+    }
+    opt--;
+    if(id[opt]) {
+	MSG_V( "Demuxer info '%s' already present as '%s'!\n",info_names[opt],id[opt]);
+	delete id[opt];
+    }
+    id[opt]=nls_recode2screen_cp(sub_data.cp,param,strlen(param));
+    return MPXP_Ok;
+}
+
+int Demuxer_Info::print(const char *filename) const
+{
+    unsigned i;
+    MSG_HINT(" CLIP INFO (%s):\n",filename);
+    for(i=0;i<INFOT_MAX;i++)
+	if(id[i])
+	    MSG_HINT("   %s: %s\n",info_names[i],id[i]);
+    return 0;
+}
+
+const char* Demuxer_Info::get(unsigned opt) const {
+    if(!opt || opt > INFOT_MAX) return NULL;
+    return id[opt-1];
+}
+} // namespaec mpxp;


Property changes on: mplayerxp/libmpdemux/demuxer_info.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Added: mplayerxp/libmpdemux/demuxer_info.h
===================================================================
--- mplayerxp/libmpdemux/demuxer_info.h	                        (rev 0)
+++ mplayerxp/libmpdemux/demuxer_info.h	2012-12-04 13:56:44 UTC (rev 507)
@@ -0,0 +1,43 @@
+#ifndef __DEMUXER_INFO_H_INCLUDED
+#define __DEMUXER_INFO_H_INCLUDED 1
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+#include "xmpcore/xmp_enums.h"
+
+namespace mpxp {
+    enum {
+	INFOT_NULL		=0,
+	INFOT_AUTHOR		=1,
+	INFOT_NAME		=2,
+	INFOT_SUBJECT		=3,
+	INFOT_COPYRIGHT		=4,
+	INFOT_DESCRIPTION	=5,
+	INFOT_ALBUM		=6,
+	INFOT_DATE		=7,
+	INFOT_TRACK		=8,
+	INFOT_GENRE		=9,
+	INFOT_ENCODER		=10,
+	INFOT_SOURCE_MEDIA	=11,
+	INFOT_WWW		=12,
+	INFOT_MAIL		=13,
+	INFOT_RATING		=14,
+	INFOT_COMMENTS		=15,
+	INFOT_MIME		=16,
+	INFOT_MAX		=16
+    };
+
+    struct Demuxer_Info : public Opaque {
+	public:
+	    Demuxer_Info();
+	    virtual ~Demuxer_Info();
+
+	    MPXP_Rc	add(unsigned opt, const char *param);
+	    const char*	get(unsigned opt) const;
+	    int		print(const char *filename) const;
+
+	private:
+	    char *id[INFOT_MAX];
+    };
+} // namespace mpxp
+#endif


Property changes on: mplayerxp/libmpdemux/demuxer_info.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: mplayerxp/libmpdemux/mux_mpxp64.cpp
===================================================================
--- mplayerxp/libmpdemux/mux_mpxp64.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/libmpdemux/mux_mpxp64.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -210,37 +210,37 @@
     const char *sname;
     fpos=mpxpav64_open_header32(f,"FCNT");
 #ifdef USE_ICONV
-    if((sname=demux_info_get(dinfo,INFOT_AUTHOR))!=NULL)
+    if((sname=dinfo->info().get(INFOT_AUTHOR))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"AUTH",sname);
-    if((sname=demux_info_get(dinfo,INFOT_NAME))!=NULL)
+    if((sname=dinfo->info().get(INFOT_NAME))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"NAME",sname);
-    if((sname=demux_info_get(dinfo,INFOT_SUBJECT))!=NULL)
+    if((sname=dinfo->info().get(INFOT_SUBJECT))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"SUBJ",sname);
-    if((sname=demux_info_get(dinfo,INFOT_COPYRIGHT))!=NULL)
+    if((sname=dinfo->info().get(INFOT_COPYRIGHT))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"CPYR",sname);
-    if((sname=demux_info_get(dinfo,INFOT_DESCRIPTION))!=NULL)
+    if((sname=dinfo->info().get(INFOT_DESCRIPTION))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"DESC",sname);
-    if((sname=demux_info_get(dinfo,INFOT_ALBUM))!=NULL)
+    if((sname=dinfo->info().get(INFOT_ALBUM))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"ALBM",sname);
-    if((sname=demux_info_get(dinfo,INFOT_DATE))!=NULL)
+    if((sname=dinfo->info().get(INFOT_DATE))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"CRDT",sname);
-    if((sname=demux_info_get(dinfo,INFOT_TRACK))!=NULL)
+    if((sname=dinfo->info().get(INFOT_TRACK))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"TRCK",sname);
-    if((sname=demux_info_get(dinfo,INFOT_GENRE))!=NULL)
+    if((sname=dinfo->info().get(INFOT_GENRE))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"GENR",sname);
-    if((sname=demux_info_get(dinfo,INFOT_ENCODER))!=NULL)
+    if((sname=dinfo->info().get(INFOT_ENCODER))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"SOFT",sname);
-    if((sname=demux_info_get(dinfo,INFOT_SOURCE_MEDIA))!=NULL)
+    if((sname=dinfo->info().get(INFOT_SOURCE_MEDIA))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"SRCM",sname);
-    if((sname=demux_info_get(dinfo,INFOT_WWW))!=NULL)
+    if((sname=dinfo->info().get(INFOT_WWW))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"IURL",sname);
-    if((sname=demux_info_get(dinfo,INFOT_MAIL))!=NULL)
+    if((sname=dinfo->info().get(INFOT_MAIL))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"MAIL",sname);
-    if((sname=demux_info_get(dinfo,INFOT_RATING))!=NULL)
+    if((sname=dinfo->info().get(INFOT_RATING))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"RATE",sname);
-    if((sname=demux_info_get(dinfo,INFOT_COMMENTS))!=NULL)
+    if((sname=dinfo->info().get(INFOT_COMMENTS))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"CMTS",sname);
-    if((sname=demux_info_get(dinfo,INFOT_MIME))!=NULL)
+    if((sname=dinfo->info().get(INFOT_MIME))!=NULL)
 	if(sname[0]) mpxpav64_put_frcc_unicode(f,"MIME",sname);
 #endif
     mpxpav64_close_header32(f,fpos);

Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp	2012-12-04 12:35:59 UTC (rev 506)
+++ mplayerxp/mplayerxp.cpp	2012-12-04 13:56:44 UTC (rev 507)
@@ -2002,7 +2002,7 @@
     if(mp_conf.benchmark) init_benchmark();
 
     /* display clip info */
-    demux_info_print(MPXPSys.demuxer(),filename);
+    MPXPSys.demuxer()->info().print(filename);
 
 // TODO: rewrite test backtrace in .asm
 //    mpxp_test_backtrace();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.