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

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

Revision: 594
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=594&view=rev
Author:   nickols_k
Date:     2012-12-21 17:47:42 +0000 (Fri, 21 Dec 2012)
Log Message:
-----------
convert MSG_* into mpxp_ostream compatible output

Modified Paths:
--------------
    mplayerxp/input2/in_msg.h
    mplayerxp/libmpdemux/demuxer_info.cpp
    mplayerxp/libmpdemux/demuxer_r.cpp
    mplayerxp/libmpdemux/demuxer_stream.cpp
    mplayerxp/libmpstream2/cache2.cpp
    mplayerxp/libmpstream2/s_cdd.cpp
    mplayerxp/libmpstream2/s_dvdnav.cpp
    mplayerxp/libmpstream2/s_dvdread.cpp
    mplayerxp/libmpstream2/s_file.cpp
    mplayerxp/libmpstream2/s_ftp.cpp
    mplayerxp/libmpstream2/s_lavc.cpp
    mplayerxp/libmpstream2/s_network.cpp
    mplayerxp/libmpstream2/s_oss.cpp
    mplayerxp/libmpstream2/s_rtsp.cpp
    mplayerxp/libmpstream2/s_tv.cpp
    mplayerxp/libmpstream2/s_udp.cpp
    mplayerxp/libmpstream2/s_vcdnav.cpp
    mplayerxp/libplaytree/asxparser.cpp
    mplayerxp/nls/mpxp_help-en.h
    mplayerxp/nls/mpxp_help-ru.h

Modified: mplayerxp/input2/in_msg.h
===================================================================
--- mplayerxp/input2/in_msg.h	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/input2/in_msg.h	2012-12-21 17:47:42 UTC (rev 594)
@@ -1,7 +1,6 @@
 #ifndef IN_MSG_H
 #define IN_MSG_H
 
-#define MSGT_CLASS MSGT_INPUT
 #include "mpxp_msg.h"
 
 namespace mpxp {

Modified: mplayerxp/libmpdemux/demuxer_info.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_info.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpdemux/demuxer_info.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -36,12 +36,12 @@
 MPXP_Rc Demuxer_Info::add(unsigned opt, const char *param)
 {
     if(!opt || opt > INFOT_MAX) {
-	MSG_WARN("Unknown info type %u\n",opt);
+	mpxp_warn<<"Unknown info type "<<opt<<std::endl;
 	return MPXP_False;
     }
     opt--;
     if(id[opt]) {
-	MSG_V( "Demuxer info '%s' already present as '%s'!\n",info_names[opt],id[opt]);
+	mpxp_v<<"Demuxer info '"<<info_names[opt]<<"' already present as '"<<id[opt]<<"'!"<<std::endl;
 	delete id[opt];
     }
     id[opt]=nls_recode2screen_cp(sub_data.cp,param,strlen(param));
@@ -51,10 +51,10 @@
 int Demuxer_Info::print(const std::string& filename) const
 {
     unsigned i;
-    MSG_HINT(" CLIP INFO (%s):\n",filename.c_str());
+    mpxp_hint<<" CLIP INFO ("<<filename<<"):"<<std::endl;
     for(i=0;i<INFOT_MAX;i++)
 	if(id[i])
-	    MSG_HINT("   %s: %s\n",info_names[i],id[i]);
+	    mpxp_hint<<"   "<<info_names[i]<<": "<<id[i]<<std::endl;
     return 0;
 }
 

Modified: mplayerxp/libmpdemux/demuxer_r.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_r.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpdemux/demuxer_r.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -39,8 +39,7 @@
     float retval;
     Demuxer* demuxer=ds->demuxer;
     mpxp_context().engine().xp_core->initial_apts_corr.need_correction=0;
-    MSG_DBG2("initial_apts from: stream_pts=%f pts_bytes=%u got_bytes=%u i_bps=%u\n"
-    ,ds->pts,ds->tell_pts(),nbytes,((sh_audio_t*)ds->demuxer->audio->sh)->i_bps);
+    mpxp_dbg2<<"initial_apts from: stream_pts="<<ds->pts<<" pts_bytes="<<ds->tell_pts()<<" got_bytes="<<nbytes<<" i_bps="<<(((sh_audio_t*)ds->demuxer->audio->sh)->i_bps)<<std::endl;
     /* FIXUP AUDIO PTS*/
     if((demuxer->file_format == Demuxer::Type_MPEG_ES ||
 	demuxer->file_format == Demuxer::Type_MPEG4_ES ||
@@ -55,7 +54,7 @@
 	    spts=ds->demuxer->stream->stream_pts();
 	    ds->pts_corr=spts>0?spts:ds->prev_pts;
 	    ds->pts_flags=0;
-	    MSG_V("***PTS discontinuity happens*** correct audio %f pts as %f\n",ds->pts,ds->pts_corr);
+	    mpxp_v<<"***PTS discontinuity happens*** correct audio "<<ds->pts<<" pts as "<<ds->pts_corr<<std::endl;
 	}
 	if(ds->pts>1.0) ds->pts_flags=1;
 	if(!ds->eof) ds->prev_pts=ds->pts+ds->pts_corr;
@@ -69,7 +68,7 @@
 	mpxp_context().engine().xp_core->initial_apts_corr.nbytes=nbytes;
 	retval = ds->pts;
     }
-    MSG_DBG2("initial_apts is: %f\n",retval);
+    mpxp_dbg2<<"initial_apts is: "<<retval<<std::endl;
     return retval;
 }
 

Modified: mplayerxp/libmpdemux/demuxer_stream.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer_stream.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpdemux/demuxer_stream.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -69,12 +69,10 @@
 	    // _first packet in stream
 	    _first=_last=dp;
 	}
-	MSG_DBG2("DEMUX: Append packet: len=%d  pts=%5.3f  pos=%u  [_packs: A=%d V=%d]\n",
-	    dp->length(),dp->pts,(unsigned int)dp->pos,demuxer->audio->_packs,demuxer->video->_packs);
+	mpxp_dbg2<<"DEMUX: Append packet: len="<<dp->length()<<"  pts="<<dp->pts<<"  pos="<<(unsigned int)dp->pos<<"  [_packs: A="<<demuxer->audio->_packs<<" V="<<demuxer->video->_packs<<"]"<<std::endl;
     }
     else
-	MSG_DBG2("DEMUX: Skip packet: len=%d  pts=%5.3f  pos=%u  [_packs: A=%d V=%d]\n",
-	    dp->length(),dp->pts,(unsigned int)dp->pos,demuxer->audio->_packs,demuxer->video->_packs);
+	mpxp_dbg2<<"DEMUX: Skip packet: len="<<dp->length()<<"  pts="<<dp->pts<<"  pos="<<(unsigned int)dp->pos<<"  [_packs: A="<<demuxer->audio->_packs<<" V="<<demuxer->video->_packs<<"]"<<std::endl;
 }
 
 void Demuxer_Stream::read_packet(Stream *stream,int len,float _pts,off_t _pos,dp_flags_e _flags){
@@ -86,7 +84,7 @@
     dp->flags=_flags;
     // append packet to DS stream:
     add_packet(dp);
-    MSG_DBG2("ds_read_packet(%u,%f,%llu,%i)\n",len,pts,pos,flags);
+    mpxp_dbg2<<"ds_read_packet("<<len<<","<<pts<<","<<pos<<","<<flags<<")"<<std::endl;
 }
 
 // return value:
@@ -96,10 +94,10 @@
     if (_buffer) delete _buffer;
 /*  free_packs(ds); */
     if(mp_conf.verbose>2) {
-	if(this==demuxer->audio) MSG_DBG3("ds_fill_buffer(d_audio) called\n");
-	else if(this==demuxer->video) MSG_DBG3("ds_fill_buffer(d_video) called\n");
-	else if(this==demuxer->sub) MSG_DBG3("ds_fill_buffer(d_sub) called\n");
-	else MSG_DBG3("ds_fill_buffer(unknown %p) called\n",this);
+	if(this==demuxer->audio) mpxp_dbg3<<"ds_fill_buffer(d_audio) called"<<std::endl;
+	else if(this==demuxer->video) mpxp_dbg3<<"ds_fill_buffer(d_video) called"<<std::endl;
+	else if(this==demuxer->sub) mpxp_dbg3<<"ds_fill_buffer(d_sub) called"<<std::endl;
+	else mpxp_dbg3<<"ds_fill_buffer(unknown) called"<<std::endl;
     }
     while(1){
 	if(_packs){
@@ -127,24 +125,24 @@
 	    return 1; //ds->_buffer_size;
 	}
 	if(demuxer->audio->_bytes>=MAX_PACK_BYTES){
-	    MSG_ERR(MSGTR_TooManyAudioInBuffer,demuxer->audio->_packs,demuxer->audio->_bytes);
-	    MSG_HINT(MSGTR_MaybeNI);
+	    mpxp_err<<"[Demuxer]:"<<MSGTR_TooManyAudioInBuffer<<":"<<demuxer->audio->_packs<<" "<<demuxer->audio->_bytes<<"bytes"<<std::endl;
+	    mpxp_hint<<MSGTR_MaybeNI<<std::endl;
 	    break;
 	}
 	if(demuxer->video->_bytes>=MAX_PACK_BYTES){
-	    MSG_ERR(MSGTR_TooManyVideoInBuffer,demuxer->video->_packs,demuxer->video->_bytes);
-	    MSG_HINT(MSGTR_MaybeNI);
+	    mpxp_err<<"[Demuxer]:"<<MSGTR_TooManyVideoInBuffer<<":"<<demuxer->video->_packs<<" "<<demuxer->video->_bytes<<"bytes"<<std::endl;
+	    mpxp_hint<<MSGTR_MaybeNI<<std::endl;
 	    break;
 	}
 	if(!demuxer->demux(this)){
-	    MSG_DBG2("ds_fill_buffer: demuxer->demux() failed\n");
+	    mpxp_dbg2<<"ds_fill_buffer: demuxer->demux() failed"<<std::endl;
 	    break; // EOF
 	}
     }
     _buffer_pos=_buffer_size=0;
     _buffer=NULL;
     _current=NULL;
-    MSG_V("ds_fill_buffer: EOF reached (stream: %s)  \n",this==demuxer->audio?"audio":"video");
+    mpxp_v<<"ds_fill_buffer: EOF reached (stream: "<<(this==demuxer->audio?"audio":"video")<<")"<<std::endl;
     eof=1;
     check_pin("demuxer",pin,DS_PIN);
     return 0;
@@ -260,13 +258,13 @@
 float Demuxer_Stream::get_next_pts() {
     while(!_first) {
 	if(demuxer->audio->_bytes>=MAX_PACK_BYTES){
-	    MSG_ERR(MSGTR_TooManyAudioInBuffer,demuxer->audio->_packs,demuxer->audio->_bytes);
-	    MSG_HINT(MSGTR_MaybeNI);
+	    mpxp_err<<"[Demuxer]:"<<MSGTR_TooManyAudioInBuffer<<":"<<demuxer->audio->_packs<<" "<<demuxer->audio->_bytes<<"bytes"<<std::endl;
+	    mpxp_hint<<MSGTR_MaybeNI<<std::endl;
 	    return -1;
 	}
 	if(demuxer->video->_bytes>=MAX_PACK_BYTES){
-	    MSG_ERR(MSGTR_TooManyVideoInBuffer,demuxer->video->_packs,demuxer->video->_bytes);
-	    MSG_HINT(MSGTR_MaybeNI);
+	    mpxp_err<<"[Demuxer]:"<<MSGTR_TooManyVideoInBuffer<<":"<<demuxer->video->_packs<<" "<<demuxer->video->_bytes<<"bytes"<<std::endl;
+	    mpxp_hint<<MSGTR_MaybeNI<<std::endl;
 	    return -1;
 	}
 	if(!demuxer->fill_buffer(this)) return -1;

Modified: mplayerxp/libmpstream2/cache2.cpp
===================================================================
--- mplayerxp/libmpstream2/cache2.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/cache2.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -3,10 +3,6 @@
 using namespace mpxp;
 #include <algorithm>
 
-#define READ_USLEEP_TIME 10000
-#define FILL_USLEEP_TIME 50000
-#define PREFILL_SLEEP_TIME 200
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -30,9 +26,12 @@
 #include "stream_msg.h"
 
 namespace mpxp {
-#define CPF_EMPTY	0x00000001UL
-#define CPF_EOF		0x80000000UL
-#define CPF_DONE	0x40000000UL /* special case for dvd packets to exclude them from sending again */
+static const int READ_USLEEP_TIME=10000;
+static const int FILL_USLEEP_TIME=50000;
+static const int PREFILL_SLEEP_TIME=200;
+static const int CPF_EMPTY=0x00000001UL;
+static const int CPF_EOF=0x80000000UL;
+static const int CPF_DONE=0x40000000UL; /* special case for dvd packets to exclude them from sending again */
 struct cache_packet_t
 {
     off_t filepos;  /* some nav-packets have length so we need to know real pos of data packet */
@@ -63,55 +62,45 @@
 	char* mem;
 };
 
-#if 0
-#define MSG_CH MSG_V
-#else
-#define MSG_CH(...)
-#endif
+inline void CACHE2_LOCK(cache_vars_t& cv) { pthread_mutex_lock(&cv.mutex); }
+inline void CACHE2_UNLOCK(cache_vars_t& cv) { pthread_mutex_unlock(&cv.mutex); }
 
-#define CACHE2_LOCK(cv) { MSG_CH("CACHE2_LOCK\n"); pthread_mutex_lock(&cv->mutex); }
-#define CACHE2_UNLOCK(cv) { MSG_CH("CACHE2_UNLOCK\n");pthread_mutex_unlock(&cv->mutex); }
+inline void CACHE2_TLOCK(cache_vars_t& cv) { pthread_mutex_lock(&cv.mutex); }
+inline void CACHE2_TUNLOCK(cache_vars_t& cv) { pthread_mutex_unlock(&cv.mutex); }
 
-#define CACHE2_TLOCK(cv) { MSG_CH("CACHE2_TLOCK\n"); pthread_mutex_lock(&cv->mutex); }
-#define CACHE2_TUNLOCK(cv) { MSG_CH("CACHE2_TUNLOCK\n");pthread_mutex_unlock(&cv->mutex); }
+inline void CACHE2_PACKET_LOCK(cache_packet_t& c) { pthread_mutex_lock(&c.cp_mutex); }
+inline void CACHE2_PACKET_UNLOCK(cache_packet_t& c) { pthread_mutex_unlock(&c.cp_mutex); }
 
-#define CACHE2_PACKET_LOCK(cidx) { MSG_CH("CACHE2_PACKET_LOCK\n"); pthread_mutex_lock(&c->packets[cidx].cp_mutex); }
-#define CACHE2_PACKET_UNLOCK(cidx) { MSG_CH("CACHE2_PACKET_UNLOCK\n");pthread_mutex_unlock(&c->packets[cidx].cp_mutex); }
+inline void CACHE2_PACKET_TLOCK(cache_packet_t& c) { pthread_mutex_lock(&c.cp_mutex); }
+inline void CACHE2_PACKET_TUNLOCK(cache_packet_t& c) { pthread_mutex_unlock(&c.cp_mutex); }
 
-#define CACHE2_PACKET_TLOCK(cidx) { MSG_CH("CACHE2_PACKET_TLOCK\n"); pthread_mutex_lock(&c->packets[cidx].cp_mutex); }
-#define CACHE2_PACKET_TUNLOCK(cidx) { MSG_CH("CACHE2_PACKET_TUNLOCK\n");pthread_mutex_unlock(&c->packets[cidx].cp_mutex); }
+inline off_t START_FILEPOS(cache_vars_t& c) { return c.packets[c.first].filepos; }
+inline off_t END_FILEPOS(cache_vars_t& c) { return c.packets[c.last].filepos+c.packets[c.last].sp.len; }
+inline unsigned CP_NEXT(cache_vars_t& c,unsigned idx) { return (idx+1)%c.npackets; }
 
-#define START_FILEPOS(c) ((c)->packets[(c)->first].filepos)
-#define END_FILEPOS(c) ((c)->packets[(c)->last].filepos+(c)->packets[(c)->last].sp.len)
-#define CP_NEXT(c,idx) (((idx)+1)%(c)->npackets)
-
 #ifdef __i386__
-#define COREDUMP() { __asm __volatile(".short 0xffff":::"memory"); }
+inline void COREDUMP() { __asm __volatile(".short 0xffff":::"memory"); }
 #else
-#define COREDUMP()
+inline void COREDUMP() {}
 #endif
 
-#if 0
-#define C2_ASSERT(cond) if(cond) { MSG_FATAL("internal error at cache2.c:%u: (%s)\n",__LINE__,#cond); COREDUMP(); }
-#else
-#define C2_ASSERT(cond) if(cond) MSG_FATAL("internal error at cache2.c:%u: (%s)\n",__LINE__,#cond);
-#endif
+inline void C2_ASSERT(int cond) { if(cond) MSG_FATAL("internal error at cache2.c: (%i)\n",cond); }
 
 static int __FASTCALL__ c2_cache_fill(cache_vars_t* c){
   int len,in_cache,legacy_eof,seek_eof;
   off_t readpos,new_start;
   unsigned cidx,cp;
 
-  CACHE2_TLOCK(c);
+  CACHE2_TLOCK(*c);
   readpos=c->read_filepos;
-  in_cache=(readpos>=START_FILEPOS(c)&&readpos<END_FILEPOS(c));
+  in_cache=(readpos>=START_FILEPOS(*c)&&readpos<END_FILEPOS(*c));
   new_start = readpos - c->back_size;
   if(new_start<c->stream->start_pos()) new_start=c->stream->start_pos();
   seek_eof=0;
   if(!in_cache && c->stream->type()&Stream::Type_Seekable) {
 	/* seeking... */
 	MSG_DBG2("Out of boundaries... seeking to %lli {in_cache(%i) %lli<%lli>%lli} \n"
-	,new_start,in_cache,START_FILEPOS(c),readpos,END_FILEPOS(c));
+	,new_start,in_cache,START_FILEPOS(*c),readpos,END_FILEPOS(*c));
 	if(c->stream->eof() || c->eof) c->stream->reset();
 	c->stream->seek(new_start);
 	if(errno) { MSG_WARN("c2_seek(drv:%s) error: %s\n",c->stream->driver_info->mrl,strerror(errno)); errno=0; }
@@ -119,31 +108,31 @@
 	c->last=c->first;
 	if(c->packets[c->first].filepos < new_start-(off_t)c->stream->sector_size())
 	    MSG_WARN("CACHE2: found wrong offset after seeking %lli (wanted: %lli)\n",c->packets[c->first].filepos,new_start);
-	MSG_DBG2("Seek done. new pos: %lli\n",START_FILEPOS(c));
+	MSG_DBG2("Seek done. new pos: %lli\n",START_FILEPOS(*c));
   } else {
     /* find new start of buffer according on readpos */
     cidx=c->first;
     do {
 	if((new_start>=c->packets[cidx].filepos&&new_start<c->packets[cidx].filepos+c->packets[cidx].sp.len)
 	   && !c->packets[cidx].sp.type) break;
-	cidx=CP_NEXT(c,cidx);
+	cidx=CP_NEXT(*c,cidx);
     }while(cidx!=c->first);
-    MSG_DBG2("CACHE2: Assigning first as %p for %lli\n",c->first,START_FILEPOS(c));
+    MSG_DBG2("CACHE2: Assigning first as %p for %lli\n",c->first,START_FILEPOS(*c));
     c->first=cidx;
   }
-  CACHE2_TUNLOCK(c);
-  if(CP_NEXT(c,c->last) == c->first || c->eof) {
+  CACHE2_TUNLOCK(*c);
+  if(CP_NEXT(*c,c->last) == c->first || c->eof) {
     MSG_DBG2("CACHE2: cache full\n");
     return 0; /* cache full */
   }
   len=0;
-  cp=cidx=c->last==c->first?c->first:CP_NEXT(c,c->last);
-  do { CACHE2_PACKET_TLOCK(cidx); c->packets[cidx].state|=CPF_EMPTY; CACHE2_PACKET_TUNLOCK(cidx); cidx=CP_NEXT(c,cidx); } while(cidx!=c->first);
+  cp=cidx=c->last==c->first?c->first:CP_NEXT(*c,c->last);
+  do { CACHE2_PACKET_TLOCK(c->packets[cidx]); c->packets[cidx].state|=CPF_EMPTY; CACHE2_PACKET_TUNLOCK(c->packets[cidx]); cidx=CP_NEXT(*c,cidx); } while(cidx!=c->first);
   cidx=cp;
   c->in_fill=1;
   while(1)
   {
-    CACHE2_PACKET_TLOCK(cidx);
+    CACHE2_PACKET_TLOCK(c->packets[cidx]);
     c->packets[cidx].sp.len=c->sector_size;
     c->packets[cidx].filepos = c->stream->tell();
     c->stream->read(c->packets[cidx].sp.buf,c->packets[cidx].sp.len);
@@ -159,27 +148,27 @@
     else	legacy_eof=0;
     if(c->packets[cidx].sp.len < 0 || (c->packets[cidx].sp.len == 0 && c->packets[cidx].sp.type == 0) || legacy_eof || seek_eof) {
 	/* EOF */
-	MSG_DBG2("CACHE2: guess EOF: %lli %lli\n",START_FILEPOS(c),END_FILEPOS(c));
+	MSG_DBG2("CACHE2: guess EOF: %lli %lli\n",START_FILEPOS(*c),END_FILEPOS(*c));
 	c->packets[cidx].state|=CPF_EOF;
 	c->eof=1;
 	c->packets[cidx].state&=~CPF_EMPTY;
 	c->packets[cidx].state&=~CPF_DONE;
 	if(errno) { MSG_WARN("c2_fill_buffer(drv:%s) error: %s\n",c->stream->driver_info->mrl,strerror(errno)); errno=0; }
-	CACHE2_PACKET_TUNLOCK(cidx);
+	CACHE2_PACKET_TUNLOCK(c->packets[cidx]);
 	break;
     }
     if(c->packets[cidx].sp.type == 0) len += c->packets[cidx].sp.len;
     c->last=cidx;
     c->packets[cidx].state&=~CPF_EMPTY;
     c->packets[cidx].state&=~CPF_DONE;
-    CACHE2_PACKET_TUNLOCK(cidx);
-    cidx=CP_NEXT(c,cidx);
-    MSG_DBG2("CACHE2: start=%lli end_filepos = %lli\n",START_FILEPOS(c),END_FILEPOS(c));
+    CACHE2_PACKET_TUNLOCK(c->packets[cidx]);
+    cidx=CP_NEXT(*c,cidx);
+    MSG_DBG2("CACHE2: start=%lli end_filepos = %lli\n",START_FILEPOS(*c),END_FILEPOS(*c));
     if(cidx==c->first) {
 	MSG_DBG2("CACHE2: end of queue is reached: %p\n",c->first);
 	break;
     }
-    CACHE2_TUNLOCK(c);
+    CACHE2_TUNLOCK(*c);
   }
   c->in_fill=0;
   MSG_DBG2("CACHE2: totally got %u bytes\n",len);
@@ -272,11 +261,11 @@
 {
   MSG_DBG2( "c2_stream_fill_buffer\n");
   if(c->eof) return 0;
-  while(c->read_filepos>=END_FILEPOS(c) || c->read_filepos<START_FILEPOS(c))
+  while(c->read_filepos>=END_FILEPOS(*c) || c->read_filepos<START_FILEPOS(*c))
   {
 	if(c->eof) break;
 	usleep(READ_USLEEP_TIME); // 10ms
-	MSG_DBG2("Waiting for %lli in %lli %lli\n",c->read_filepos,START_FILEPOS(c),END_FILEPOS(c));
+	MSG_DBG2("Waiting for %lli in %lli %lli\n",c->read_filepos,START_FILEPOS(*c),END_FILEPOS(*c));
 	continue; // try again...
   }
   return c->eof?0:1;
@@ -290,12 +279,12 @@
     c->stream->reset();
     cidx=c->first;
     was_eof=0;
-    do{ was_eof |= (c->packets[cidx].state&CPF_EOF); c->packets[cidx].state&=~CPF_EOF; cidx=CP_NEXT(c,cidx); }while(cidx!=c->first);
+    do{ was_eof |= (c->packets[cidx].state&CPF_EOF); c->packets[cidx].state&=~CPF_EOF; cidx=CP_NEXT(*c,cidx); }while(cidx!=c->first);
     c->eof=0;
     if(was_eof)
     {
 	cidx=c->first;
-	do{ c->packets[cidx].state|=CPF_EMPTY; cidx=CP_NEXT(c,cidx); }while(cidx!=c->first);
+	do{ c->packets[cidx].state|=CPF_EMPTY; cidx=CP_NEXT(*c,cidx); }while(cidx!=c->first);
 	c->last=c->first;
 	c->read_filepos=c->stream->start_pos();
 	c->stream->seek(c->read_filepos);
@@ -304,43 +293,43 @@
 
 static int __FASTCALL__ c2_stream_seek_long(cache_vars_t* c,off_t pos){
 
-  MSG_DBG2("CACHE2_SEEK: %lli,%lli,%lli <> %lli\n",START_FILEPOS(c),c->read_filepos,END_FILEPOS(c),pos);
-  if(pos<0/* || pos>END_FILEPOS(c)*/) { c->eof=1; return 0; }
+  MSG_DBG2("CACHE2_SEEK: %lli,%lli,%lli <> %lli\n",START_FILEPOS(*c),c->read_filepos,END_FILEPOS(*c),pos);
+  if(pos<0/* || pos>END_FILEPOS(*c)*/) { c->eof=1; return 0; }
   while(c->in_fill) yield_timeslice();
-  CACHE2_LOCK(c);
+  CACHE2_LOCK(*c);
   if(c->eof) c2_stream_reset(c);
   C2_ASSERT(pos < c->stream->start_pos());
   c->read_filepos=pos;
-  CACHE2_UNLOCK(c);
+  CACHE2_UNLOCK(*c);
   c2_stream_fill_buffer(c);
-  return c->eof?pos<END_FILEPOS(c)?1:0:1;
+  return c->eof?pos<END_FILEPOS(*c)?1:0:1;
 }
 
 static unsigned __FASTCALL__ c2_find_packet(cache_vars_t* c,off_t pos)
 {
     unsigned retval;
-    CACHE2_LOCK(c);
+    CACHE2_LOCK(*c);
     retval = c->first;
-    CACHE2_UNLOCK(c);
+    CACHE2_UNLOCK(*c);
     while(1)
     {
-	CACHE2_PACKET_LOCK(retval);
-	while(c->packets[retval].state&CPF_EMPTY) { CACHE2_PACKET_UNLOCK(retval); usleep(0); CACHE2_PACKET_LOCK(retval); }
+	CACHE2_PACKET_LOCK(c->packets[retval]);
+	while(c->packets[retval].state&CPF_EMPTY) { CACHE2_PACKET_UNLOCK(c->packets[retval]); usleep(0); CACHE2_PACKET_LOCK(c->packets[retval]); }
 	if((pos >= c->packets[retval].filepos &&
 	    pos < c->packets[retval].filepos+c->packets[retval].sp.len &&
 	    !c->packets[retval].sp.type) ||
 	    (c->packets[retval].state&CPF_EOF))
 			break; /* packet is locked */
-	CACHE2_PACKET_UNLOCK(retval);
-	CACHE2_LOCK(c);
-	retval=CP_NEXT(c,retval);
+	CACHE2_PACKET_UNLOCK(c->packets[retval]);
+	CACHE2_LOCK(*c);
+	retval=CP_NEXT(*c,retval);
 	if(retval==c->first)
 	{
 	    MSG_DBG2("Can't find packet for offset %lli\n",pos);
-	    CACHE2_UNLOCK(c);
+	    CACHE2_UNLOCK(*c);
 	    return UINT_MAX;
 	}
-	CACHE2_UNLOCK(c);
+	CACHE2_UNLOCK(*c);
     }
     return retval;
 }
@@ -362,7 +351,7 @@
 		c->packets[i].sp.len<0 ||
 		c->packets[i].state&CPF_EMPTY ||
 		(c->packets[i].sp.len==0 && c->packets[i].sp.type)) break;
-	    CACHE2_PACKET_LOCK(i);
+	    CACHE2_PACKET_LOCK(c->packets[i]);
 	    *len += c->packets[i].sp.len;
 	    (*npackets)++;
 	}
@@ -376,7 +365,7 @@
   {
     cidx = c2_find_packet(c,pos);
     if(cidx!=UINT_MAX || c->eof) break;
-    if(cidx!=UINT_MAX) CACHE2_PACKET_UNLOCK(cidx);
+    if(cidx!=UINT_MAX) CACHE2_PACKET_UNLOCK(c->packets[cidx]);
     c2_stream_fill_buffer(c);
   }
   c2_get_continious_mem(c,cidx,len,npackets);
@@ -388,20 +377,20 @@
     MSG_DBG2("next_packet: start=%p cur=%i\n",c->first,cidx);
     while(1)
     {
-	CACHE2_LOCK(c);
-	cidx=CP_NEXT(c,cidx);
-	CACHE2_UNLOCK(c);
-	CACHE2_PACKET_LOCK(cidx);
-	while(c->packets[cidx].state&CPF_EMPTY) { CACHE2_PACKET_UNLOCK(cidx); usleep(0); CACHE2_PACKET_LOCK(cidx); }
+	CACHE2_LOCK(*c);
+	cidx=CP_NEXT(*c,cidx);
+	CACHE2_UNLOCK(*c);
+	CACHE2_PACKET_LOCK(c->packets[cidx]);
+	while(c->packets[cidx].state&CPF_EMPTY) { CACHE2_PACKET_UNLOCK(c->packets[cidx]); usleep(0); CACHE2_PACKET_LOCK(c->packets[cidx]); }
 	if(cidx==c->first)
 	{
-	    CACHE2_PACKET_UNLOCK(cidx);
+	    CACHE2_PACKET_UNLOCK(c->packets[cidx]);
 	    c2_stream_fill_buffer(c);
 	    cidx = c2_find_packet(c,c->read_filepos);
 	    break;
 	}
 	if(!c->packets[cidx].sp.type) break; /* packet is locked */
-	CACHE2_PACKET_UNLOCK(cidx);
+	CACHE2_PACKET_UNLOCK(c->packets[cidx]);
     }
     c2_get_continious_mem(c,cidx,len,npackets);
     MSG_DBG2("next_packet: rp: %lli fp: %lli len %lu type %i\n",c->read_filepos,c->packets[cidx].filepos,c->packets[cidx].sp.len,c->packets[cidx].sp.type);
@@ -415,18 +404,18 @@
   unsigned cur,i,npackets;
   cur=c2_wait_packet(c,c->read_filepos,&mlen,&npackets);
   eof = cur!=UINT_MAX?((int)(c->packets[cur].state&CPF_EOF)):c->eof;
-  if(cur==UINT_MAX||eof) { if(cur!=UINT_MAX) CACHE2_PACKET_UNLOCK(cur); return 0; }
+  if(cur==UINT_MAX||eof) { if(cur!=UINT_MAX) CACHE2_PACKET_UNLOCK(c->packets[cur]); return 0; }
   MSG_DBG2( "c2_stream_read  %i bytes from %lli\n",total,c->read_filepos);
   while(len){
     int x;
     if(c->read_filepos>=c->packets[cur].filepos+mlen){
-	for(i=0;i<npackets;i++) CACHE2_PACKET_UNLOCK(cur+i);
+	for(i=0;i<npackets;i++) CACHE2_PACKET_UNLOCK(c->packets[cur+i]);
 	mlen=len;
 	cur=c2_next_packet(c,cur,&mlen,&npackets);
 	eof = cur!=UINT_MAX?(c->packets[cur].state&CPF_EOF):1;
 	if(eof)
 	{
-	    CACHE2_PACKET_UNLOCK(cur);
+	    CACHE2_PACKET_UNLOCK(c->packets[cur]);
 	    return total-len; // EOF
 	}
     }
@@ -440,7 +429,7 @@
     mem+=x; len-=x;
     c->read_filepos+=x;
   }
-  CACHE2_PACKET_UNLOCK(cur);
+  CACHE2_PACKET_UNLOCK(c->packets[cur]);
   if(mp_conf.verbose>2)
   {
     MSG_DBG2( "c2_stream_read  got %u bytes ",total);
@@ -457,8 +446,8 @@
 
 static int __FASTCALL__ c2_stream_seek(cache_vars_t* c,off_t pos)
 {
-  MSG_DBG2( "c2_seek to %lli (%lli %lli) %i\n",(long long)pos,(long long)START_FILEPOS(c),(long long)END_FILEPOS(c),c->first);
-  if(pos>=START_FILEPOS(c) && pos < END_FILEPOS(c))
+  MSG_DBG2( "c2_seek to %lli (%lli %lli) %i\n",(long long)pos,(long long)START_FILEPOS(*c),(long long)END_FILEPOS(*c),c->first);
+  if(pos>=START_FILEPOS(*c) && pos < END_FILEPOS(*c))
   {
 	c->read_filepos=pos;
 	return pos;
@@ -476,7 +465,7 @@
     unsigned cur;
     int retval;
     cur = c2_find_packet(c,c->read_filepos);
-    if(cur!=UINT_MAX) CACHE2_PACKET_UNLOCK(cur);
+    if(cur!=UINT_MAX) CACHE2_PACKET_UNLOCK(c->packets[cur]);
     retval = cur!=UINT_MAX?((int)(c->packets[cur].state&CPF_EOF)):c->eof;
     MSG_DBG2("stream_eof: %i\n",retval);
     return retval;
@@ -490,7 +479,7 @@
     {
 	if(eof) c->packets[cur].state|=CPF_EOF;
 	else	c->packets[cur].state&=~CPF_EOF;
-	CACHE2_PACKET_UNLOCK(cur);
+	CACHE2_PACKET_UNLOCK(c->packets[cur]);
     }
     c->eof=eof;
     MSG_DBG2("stream_set_eof: %i\n",eof);
@@ -524,17 +513,17 @@
     c->pth=mpxp_context().engine().xp_core->mpxp_threads[rc];
     // wait until cache is filled at least prefill_init %
     MSG_V("CACHE_PRE_INIT: %lld [%lld] %lld  pre:%d  eof:%d SS=%u \n",
-	START_FILEPOS(c),c->read_filepos,END_FILEPOS(c),_min,c->eof,ss);
-    while((c->read_filepos<START_FILEPOS(c) || END_FILEPOS(c)-c->read_filepos<_min)
-	&& !c->eof && CP_NEXT(c,c->last)!=c->first){
+	START_FILEPOS(*c),c->read_filepos,END_FILEPOS(*c),_min,c->eof,ss);
+    while((c->read_filepos<START_FILEPOS(*c) || END_FILEPOS(*c)-c->read_filepos<_min)
+	&& !c->eof && CP_NEXT(*c,c->last)!=c->first){
 	if(!(type()&Stream::Type_Seekable))
 	MSG_STATUS("\rCache fill: %5.2f%% (%d bytes)    ",
-	    100.0*(float)(END_FILEPOS(c)-c->read_filepos)/(float)(c->buffer_size),
-	    END_FILEPOS(c)-c->read_filepos);
+	    100.0*(float)(END_FILEPOS(*c)-c->read_filepos)/(float)(c->buffer_size),
+	    END_FILEPOS(*c)-c->read_filepos);
 	else
 	MSG_V("\rCache fill: %5.2f%% (%d bytes)    ",
-	    100.0*(float)(END_FILEPOS(c)-c->read_filepos)/(float)(c->buffer_size),
-	    END_FILEPOS(c)-c->read_filepos);
+	    100.0*(float)(END_FILEPOS(*c)-c->read_filepos)/(float)(c->buffer_size),
+	    END_FILEPOS(*c)-c->read_filepos);
 	if(c->eof) break; // file is smaller than prefill size
 	if(mpdemux_check_interrupt(libinput,PREFILL_SLEEP_TIME))
 	  return;

Modified: mplayerxp/libmpstream2/s_cdd.cpp
===================================================================
--- mplayerxp/libmpstream2/s_cdd.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_cdd.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -53,7 +53,7 @@
     char *device;
     UNUSED(flags);
     if(filename=="help") {
-	MSG_HINT("Usage: cdda://<@device><#trackno>\n");
+	mpxp_hint<<"Usage: cdda://<@device><#trackno>"<<std::endl;
 	return MPXP_False;
     }
     param=mrl_parse_line(filename,NULL,NULL,&device,NULL);
@@ -103,7 +103,7 @@
 	case SCTRL_AUD_GET_CHANNELS:
 	    *(int *)args=priv->channels(track_idx);
 	    if(*(int *)args<=0) *(int *)args=2;
-	    MSG_V("cdda channels: %u\n",*(int *)args);
+	    mpxp_v<<"cdda channels: "<<*(int *)args<<std::endl;
 	    return MPXP_Ok;
 	case SCTRL_AUD_GET_SAMPLERATE:
 	    *(int *)args = 44100;
@@ -150,7 +150,7 @@
     MPXP_Rc retval;
     UNUSED(flags);
     if(filename=="help") {
-	MSG_HINT("Usage: cddb://<@device><#trackno>\n");
+	mpxp_hint<<"Usage: cddb://<@device><#trackno>"<<std::endl;
 	return MPXP_False;
     }
     param=mrl_parse_line(filename,NULL,NULL,&device,NULL);

Modified: mplayerxp/libmpstream2/s_dvdnav.cpp
===================================================================
--- mplayerxp/libmpstream2/s_dvdnav.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_dvdnav.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -130,7 +130,7 @@
 
     /* report the title?! */
      if (dvdnav_get_title_string(dvdnav,&title_str)==DVDNAV_STATUS_OK) {
-	    MSG_INFO("Title: '%s'\n",title_str);
+	    mpxp_info<<"Title: "<<title_str<<std::endl;
     }
     return MPXP_Ok;
 }
@@ -144,11 +144,11 @@
 	case 0:
 	    return;
 	case 0xff:
-	    MSG_V( "Sleeping indefinately\n" );
+	    mpxp_v<<"Sleeping indefinately"<<std::endl;
 	    sleeping=2;
 	    break;
 	default:
-	    MSG_V( "Sleeping %d sec(s)\n", seconds );
+	    mpxp_v<<"Sleeping "<<seconds<<"sec(s)"<<std::endl;
 	    sleep_until = GetTimer();// + seconds*1000000;
 	    sleeping=1;
 	    break;
@@ -167,10 +167,10 @@
 	}
 	dvdnav_still_skip(dvdnav); // continue past...
 	sleeping=0;
-	MSG_V("%s: woke up!\n",__FUNCTION__);
+	mpxp_v<<"woke up!"<<std::endl;
     }
     dvd_nav_still=0;
-    MSG_V("%s: active\n",__FUNCTION__);
+    mpxp_v<<"active"<<std::endl;
     return 0;
 }
 
@@ -187,15 +187,15 @@
     filename=_filename;
     param=mrl_parse_line(_filename,NULL,NULL,&dvd_device,NULL);
     if(strcmp(param,"help") == 0) {
-	MSG_HINT("Usage: dvdnav://<title>,<chapter>\n");
+	mpxp_hint<<"Usage: dvdnav://<title>,<chapter>"<<std::endl;
 	return MPXP_False;
     }
     param=mrl_parse_params(param,dvdnavopts_conf);
     if (new_stream(dvd_device?dvd_device:DEFAULT_DVD_DEVICE)!=MPXP_Ok) {
-	MSG_ERR(MSGTR_CantOpenDVD,dvd_device?dvd_device:DEFAULT_DVD_DEVICE);
+	mpxp_err<<MSGTR_CantOpenDVD<<":"<<(dvd_device?dvd_device:DEFAULT_DVD_DEVICE)<<std::endl;
 	if(!dvd_device) {
 	    if (new_stream(DEFAULT_CDROM_DEVICE)!=MPXP_Ok)
-		MSG_ERR(MSGTR_CantOpenDVD,DEFAULT_CDROM_DEVICE);
+		mpxp_err<<MSGTR_CantOpenDVD<<":"<<DEFAULT_CDROM_DEVICE<<std::endl;
 	    else
 		goto dvd_ok;
 	}
@@ -214,16 +214,16 @@
     dvdnav_set_PGC_positioning_flag(dvdnav,1);
     ntitles=0;
     dvdnav_get_number_of_titles(dvdnav,&ntitles);
-    MSG_INFO(MSGTR_DVDnumTitles,ntitles);
+    mpxp_info<<MSGTR_DVDnumTitles<<":"<<ntitles<<std::endl;
     if(dvdnav_conf.title != -1) {
 	int nparts;
 	dvdnav_get_number_of_parts(dvdnav,dvdnav_conf.title,&nparts);
-	MSG_INFO(MSGTR_DVDnumChapters,dvdnav_conf.title,nparts);
+	mpxp_info<<MSGTR_DVDnumChapters<<":"<<dvdnav_conf.title<<":"<<nparts<<std::endl;
 	if(dvdnav_conf.chapter != -1)	dvdnav_part_play(dvdnav,dvdnav_conf.title,dvdnav_conf.chapter);
 	else				dvdnav_title_play(dvdnav,dvdnav_conf.title);
 	cpos=2048; /* disallow dvdnav_reset */
 	dvdnav_current_title_info(dvdnav,&dvdnav_conf.title,&dvdnav_conf.chapter);
-	MSG_INFO("Playing %i part of %i title\n",dvdnav_conf.chapter,dvdnav_conf.title);
+	mpxp_info<<"Playing "<<dvdnav_conf.chapter<<" part of "<<dvdnav_conf.title<<" title"<<std::endl;
     }
     return MPXP_Ok;
 }
@@ -248,7 +248,7 @@
     if (!de->details) return;
 
     if (dvd_nav_still) {
-	MSG_V("%s: got a stream_read while I should be asleep!\n",__FUNCTION__);
+	mpxp_v<<"got a stream_read while I should be asleep!"<<std::endl;
 	de->event=DVDNAV_STILL_FRAME;
 	de->len=0;
 	return;
@@ -256,7 +256,7 @@
     done=0;
     while(!done) {
 	if (dvdnav_get_next_block(dvdnav,reinterpret_cast<uint8_t*>(de->details),&event,&de->len)!=DVDNAV_STATUS_OK) {
-	    MSG_ERR( "Error getting next block from DVD (%s)\n",dvdnav_err_to_string(dvdnav) );
+	    mpxp_err<<"Error getting next block from DVD: "<<dvdnav_err_to_string(dvdnav)<<std::endl;
 	    de->len=-1;
 	}
 	if(event == DVDNAV_STILL_FRAME) {
@@ -275,13 +275,11 @@
 	    _this=dvdnav_get_current_nav_pci(dvdnav);
 	    vobu_s_pts=_this->pci_gi.vobu_s_ptm/90000.;
 	    vobu_e_pts=_this->pci_gi.vobu_e_ptm/90000.;
-	    MSG_V("Handling NAV_PACKET: vobu_s_ptm=%f vobu_e_ptm=%f e_eltm=%f\n"
-		,vobu_s_pts
-		,vobu_e_pts
-		,(float)_this->pci_gi.e_eltm.second+_this->pci_gi.e_eltm.minute*60.+_this->pci_gi.e_eltm.hour*3600.);
+	    mpxp_v<<"Handling NAV_PACKET: vobu_s_ptm="<<vobu_s_pts
+		<<" vobu_e_ptm="<<vobu_e_pts<<" e_eltm="<<((float)_this->pci_gi.e_eltm.second+_this->pci_gi.e_eltm.minute*60.+_this->pci_gi.e_eltm.hour*3600.)<<std::endl;
 	    if(vobu_s_pts < vobu_e_pts) {
 		_stream_pts += vobu_e_pts-vobu_s_pts;
-		MSG_V("DVD's discontinuities found! Applying delta: %f\n",_stream_pts);
+		mpxp_v<<"DVD's discontinuities found! Applying delta: "<<_stream_pts<<std::endl;
 	    }
 	    else _stream_pts = vobu_s_pts;
 	    vobu_s_pts = vobu_s_pts;
@@ -291,13 +289,11 @@
 	    dvdnav_current_title_info(dvdnav, &ct, &cc);
 	    if(ct<=0) {
 		menu_mode=1;
-		MSG_V("entering menu mode: %i %i\n",ct,cc);
-		MSG_V("vmgm: %i vtsm: %i\n",
-		    dvdnav_is_domain_vmgm(dvdnav),
-		    dvdnav_is_domain_vtsm(dvdnav));
+		mpxp_v<<"entering menu mode: "<<ct<<" "<<cc<<std::endl;
+		mpxp_v<<"vmgm: "<<dvdnav_is_domain_vmgm(dvdnav)<<" vtsm: "<<dvdnav_is_domain_vtsm(dvdnav)<<std::endl;
 	    } else {
 		menu_mode=0;
-		MSG_V("leaving menu mode: %i %i\n",ct,cc);
+		mpxp_v<<"leaving menu mode: "<<ct<<" "<<cc<<std::endl;
 	    }
 	} else done=1;
     }
@@ -402,7 +398,7 @@
 	    dvdnav_highlight_event_t *_hlev = (dvdnav_highlight_event_t*)(sp->buf);
 	    int btnum;
 	    int display_mode=1;
-	    MSG_V("DVDNAV_HIGHLIGHT: %i %i %i %i\n",_hlev->sx,_hlev->sy,_hlev->ex,_hlev->ey);
+	    mpxp_v<<"DVDNAV_HIGHLIGHT: "<<_hlev->sx<<" "<<_hlev->sy<<" "<<_hlev->ex<<" "<<_hlev->ey<<std::endl;
 	    if (!dvdnav)  return;
 	    memcpy(&hlev,_hlev,sizeof(dvdnav_highlight_event_t));
 	    pnavpci = dvdnav_get_current_nav_pci (dvdnav);
@@ -435,7 +431,7 @@
 	}
 	case DVDNAV_STILL_FRAME: {
 	    const dvdnav_still_event_t *still_event = (const dvdnav_still_event_t*)(sp->buf);
-		MSG_DBG2( "######## DVDNAV Event: Still Frame: %d sec(s)\n", still_event->length );
+		mpxp_dbg2<<"######## DVDNAV Event: Still Frame: "<<still_event->length<<" sec(s)"<<std::endl;
 		while (stream_sleeping()) {
 		    yield_timeslice();
 		}
@@ -443,22 +439,15 @@
 		break;
 	    }
 	case DVDNAV_STOP:
-	    MSG_DBG2( "DVDNAV Event: Nav Stop\n" );
+	    mpxp_dbg2<<"DVDNAV Event: Nav Stop"<<std::endl;
 	    break;
 	case DVDNAV_NOP:
-	    MSG_V("DVDNAV Event: Nav NOP\n");
+	    mpxp_v<<"DVDNAV Event: Nav NOP"<<std::endl;
 	    break;
 #if 0
 	case DVDNAV_SPU_STREAM_CHANGE: {
 	    const dvdnav_spu_stream_change_event_t * stream_change=(const dvdnav_spu_stream_change_event_t*)(sp->buf);
-	    MSG_DBG2("DVDNAV Event: Nav SPU Stream Change: phys_wide: %d phys_letterbox: %d phys_panscan: %d logical: %d\n",
-	    stream_change->physical_wide,
-	    stream_change->physical_letterbox,
-	    stream_change->physical_pan_scan,
-	    stream_change->logical);
 	    if (mpxp_context().video().output->spudec && mp_conf.dvdsub_id!=stream_change->physical_wide) {
-		MSG_DBG2("d_dvdsub->id change: was %d is now %d\n",
-			d_dvdsub->id,stream_change->physical_wide);
 		    // FIXME: need a better way to change SPU id
 		d_dvdsub->id=mp_conf.dvdsub_id=stream_change->physical_wide;
 		if (mpxp_context().video().output->spudec) spudec_reset(mpxp_context().video().output->spudec);
@@ -468,14 +457,9 @@
 	case DVDNAV_AUDIO_STREAM_CHANGE: {
 	    int aid_temp;
 	    const dvdnav_audio_stream_change_event_t *stream_change = (const dvdnav_audio_stream_change_event_t*)(sp->buf);
-	    MSG_DBG2("DVDNAV Event: Nav Audio Stream Change: phys: %d logical: %d\n",
-		    stream_change->physical,
-		    stream_change->logical);
 	    aid_temp=stream_change->physical;
 	    if (aid_temp>=0) aid_temp+=128; // FIXME: is this sane?
 	    if (d_audio && mp_conf.audio_id!=aid_temp) {
-		MSG_DBG2("d_audio->id change: was %d is now %d\n",
-			d_audio->id,aid_temp);
 		// FIXME: need a bettery way to change audio stream id
 		d_audio->id=mp_conf.dvdsub_id=aid_temp;
 		mpxp_resync_audio_stream();
@@ -485,27 +469,25 @@
 #endif
 	case DVDNAV_VTS_CHANGE:{
 	    const dvdnav_vts_change_event_t *evts = (const dvdnav_vts_change_event_t *)(sp->buf);
-	    MSG_V("DVDNAV Event: Nav VTS Change %u\n",evts->new_domain);
+	    mpxp_v<<"DVDNAV Event: Nav VTS Change "<<evts->new_domain<<std::endl;
 	    }
 	    break;
 	case DVDNAV_CELL_CHANGE: {
 	    const dvdnav_cell_change_event_t *ecell=(const dvdnav_cell_change_event_t*)(sp->buf);
-	    MSG_V("DVDNAV_CELL_CHANGE: N=%i pgN=%i cell_start=%f pg_start=%f cell_length=%f pg_length=%f pgc_length=%f\n"
-		,ecell->cellN
-		,ecell->pgN
-		,ecell->cell_start/90000.
-		,ecell->pg_start/90000.
-		,ecell->cell_length/90000.
-		,ecell->pg_length/90000.
-		,ecell->pgc_length/90000.);
+	    mpxp_v<<"DVDNAV_CELL_CHANGE: N="<<ecell->cellN
+		<<" pgN="<<ecell->pgN<<" cell_start="<<(ecell->cell_start/90000.)
+		<<" pg_start="<<(ecell->pg_start/90000.)
+		<<" cell_length="<<(ecell->cell_length/90000.)
+		<<" pg_length="<<(ecell->pg_length/90000.)
+		<<" pgc_length="<<(ecell->pgc_length/90000.)<<std::endl;
 	    }
 	    break;
 	case DVDNAV_NAV_PACKET:
-	    MSG_V("DVDNAV Event: Nav Packet\n");
+	    mpxp_v<<"DVDNAV Event: Nav Packet"<<std::endl;
 	    break;
 	case DVDNAV_SPU_CLUT_CHANGE:
-	    MSG_DBG2("DVDNAV Event: Nav SPU CLUT Change\n");
-	    if(sp->len!=64) MSG_WARN("DVDNAV Event: Nav SPU CLUT Change: %i bytes <> 64\n",sp->len);
+	    mpxp_dbg2<<"DVDNAV Event: Nav SPU CLUT Change"<<std::endl;
+	    if(sp->len!=64) mpxp_warn<<"DVDNAV Event: Nav SPU CLUT Change: "<<sp->len<<" bytes <> 64"<<std::endl;
 	    // send new palette to SPU decoder
 	    if (mpxp_context().video().output->spudec) spudec_update_palette(mpxp_context().video().output->spudec,(const unsigned int *)(sp->buf));
 	    break;
@@ -531,7 +513,7 @@
 	  break;
 	case MP_CMD_DVDNAV_MENU: {
 	    int title,part;
-	    MSG_V("Menu call\n");
+	    mpxp_v<<"Menu call"<<std::endl;
 	    dvdnav_current_title_info(dvdnav, &title, &part);
 	    if(title>0) {
 		if(dvdnav_menu_call(dvdnav, DVD_MENU_Part) == DVDNAV_STATUS_OK
@@ -546,7 +528,7 @@
 	  dvdnav_button_activate(dvdnav,pci);
 	  break;
 	default:
-	  MSG_V("Weird DVD Nav cmd %d\n",cmd);
+	  mpxp_v<<"Weird DVD Nav cmd "<<cmd<<std::endl;
 	  break;
     }
     dvdnav_get_current_highlight(dvdnav, &button);

Modified: mplayerxp/libmpstream2/s_dvdread.cpp
===================================================================
--- mplayerxp/libmpstream2/s_dvdread.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_dvdread.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -5,6 +5,7 @@
     s_dvdread - DVDREAD stream interface
 */
 #include <limits>
+#include <iomanip>
 
 #include "mplayerxp.h"
 /* fake stdint */
@@ -161,14 +162,13 @@
 	code=lang[1]|(lang[0]<<8);
 	for(i=0;i<unsigned(nr_of_channels);i++){
 	    if(audio_streams[i].language==code){
-		MSG_V("Selected DVD audio channel: %d language: %c%c\n",
-			audio_streams[i].id, lang[0],lang[1]);
+		mpxp_v<<"Selected DVD audio channel: "<<audio_streams[i].id<<" language: "<<lang[0]<<lang[1]<<std::endl;
 		return audio_streams[i].id;
 	    }
 	}
 	lang+=2; while (lang[0]==',' || lang[0]==' ') ++lang;
     }
-    MSG_WARN("No matching DVD audio language found!\n");
+    mpxp_warn<<"No matching DVD audio language found!"<<std::endl;
     return -1;
 }
 
@@ -180,14 +180,13 @@
 	code=lang[1]|(lang[0]<<8);
 	for(i=0;i<unsigned(nr_of_subtitles);i++){
 	    if(subtitles[i].language==code){
-		MSG_V("Selected DVD subtitle channel: %d language: %c%c\n",
-			subtitles[i].id, lang[0],lang[1]);
+		mpxp_v<<"Selected DVD subtitle channel: "<<subtitles[i].id<<" language: "<<lang[0]<<lang[1]<<std::endl;
 		return subtitles[i].id;
 	    }
 	}
 	lang+=2; while (lang[0]==',' || lang[0]==' ') ++lang;
     }
-    MSG_WARN("No matching DVD subtitle language found!\n");
+    mpxp_warn<<"No matching DVD subtitle language found!"<<std::endl;
     return -1;
 }
 
@@ -201,7 +200,7 @@
 {
     int ttn,pgc_id,pgn;
 
-    MSG_V("dvd_next_title %d\n",dvd_title);
+    mpxp_v<<"dvd_next_title "<<dvd_title<<std::endl;
 
     if(vts_file) ifoClose(vts_file);
     if(title)    DVDCloseFile(title);
@@ -210,8 +209,7 @@
      */
     vts_file = ifoOpen(dvd, tt_srpt->title[dvd_title].title_set_nr );
     if( !vts_file ) {
-	MSG_ERR( MSGTR_DVDnoIFO,
-		 tt_srpt->title[dvd_title].title_set_nr );
+	mpxp_err<<MSGTR_DVDnoIFO<<":"<<tt_srpt->title[dvd_title].title_set_nr<<std::endl;
 	ifoClose( vmg_file );
 	DVDClose( dvd );
 	return 0;
@@ -222,8 +220,7 @@
     title = DVDOpenFile( dvd, tt_srpt->title[dvd_title].title_set_nr,
 			 DVD_READ_TITLE_VOBS );
     if( !title ) {
-	MSG_ERR( MSGTR_DVDnoVOBs,
-		 tt_srpt->title[dvd_title].title_set_nr );
+	mpxp_err<<MSGTR_DVDnoVOBs<<tt_srpt->title[dvd_title].title_set_nr<<std::endl;
 	ifoClose( vts_file );
 	ifoClose( vmg_file );
 	DVDClose( dvd );
@@ -282,17 +279,14 @@
 		//  1 - stereo
 		//  5 - 5.1
 		audio_streams[nr_of_channels].channels=audio->channels;
-		MSG_V("[open] audio stream: %d audio format: %s (%s) language: %s aid: %d\n",
-		    nr_of_channels,
-		    dvd_audio_stream_types[ audio->audio_format ],
-		    dvd_audio_stream_channels[ audio->channels ],
-		    tmp,
-		    audio_streams[nr_of_channels].id
-		);
+		mpxp_v<<"[open] audio stream: "<<nr_of_channels
+		    <<" audio format: "<<dvd_audio_stream_types[ audio->audio_format ]
+		    <<" ("<<dvd_audio_stream_channels[ audio->channels ]
+		    <<") language: "<<tmp<<" aid: "<<audio_streams[nr_of_channels].id<<std::endl;
 		nr_of_channels++;
 	    }
 	}
-	MSG_V("[open] number of audio channels on disk: %d.\n",nr_of_channels );
+	mpxp_v<<"[open] number of audio channels on disk: "<<nr_of_channels<<std::endl;
     }
 
     /**
@@ -322,13 +316,11 @@
 	    else if(video->display_aspect_ratio == 3) /* 16:9 */
 		subtitles[nr_of_subtitles].id = vts_file->vts_pgcit->pgci_srp[ttn].pgc->subp_control[i] >> 8 & 31;
 
-	    MSG_V("[open] subtitle ( sid ): %d language: %s\n",
-		nr_of_subtitles,
-		tmp );
+	    mpxp_v<<"[open] subtitle ( sid ): "<<nr_of_subtitles<<" language: "<<tmp<<std::endl;
 	    nr_of_subtitles++;
 	}
     }
-    MSG_V("[open] number of subtitles on disk: %d\n",nr_of_subtitles );
+    mpxp_v<<"[open] number of subtitles on disk: "<<nr_of_subtitles<<std::endl;
     /**
      * Determine which program chain we want to watch.  This is based on the
      * chapter number.
@@ -350,14 +342,14 @@
     if( cur_pgc->cell_playback[cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK ) cur_cell+=dvd_angle;
     cur_pack = cur_pgc->cell_playback[ cur_cell ].first_sector;
     cell_last_pack=cur_pgc->cell_playback[ cur_cell ].last_sector;
-    MSG_V( "DVD start cell: %d  pack: 0x%X-0x%X  \n",cur_cell,cur_pack,cell_last_pack);
+    mpxp_v<<"DVD start cell: "<<cur_cell<<"  pack: 0x"<<std::hex<<cur_pack<<"-0x"<<std::hex<<cell_last_pack<<std::endl;
     return 1;
 }
 
 int DvdRead_Stream_Interface::next_cell(){
     int _next_cell=cur_cell;
 
-    MSG_V( "dvd_next_cell: next1=0x%X  \n",_next_cell);
+    mpxp_v<<"dvd_next_cell: next1=0x"<<std::hex<<_next_cell<<std::endl;
 
     if( cur_pgc->cell_playback[ _next_cell ].block_type == BLOCK_TYPE_ANGLE_BLOCK ) {
 	while(_next_cell<last_cell) {
@@ -365,7 +357,7 @@
 	    ++_next_cell;
 	}
     }
-    MSG_V( "dvd_next_cell: next2=0x%X  \n",_next_cell);
+    mpxp_v<<"dvd_next_cell: next2=0x"<<std::hex<<_next_cell<<std::endl;
 
     ++_next_cell;
     if(_next_cell>=last_cell) return -1; // EOF
@@ -373,7 +365,7 @@
 	_next_cell+=dvd_angle;
 	if(_next_cell>=last_cell) return -1; // EOF
     }
-    MSG_V( "dvd_next_cell: next3=0x%X  \n",_next_cell);
+    mpxp_v<<"dvd_next_cell: next3=0x"<<std::hex<<_next_cell<<std::endl;
     return _next_cell;
 }
 
@@ -394,10 +386,10 @@
 	if( dsi_pack.vobu_sri.next_vobu != SRI_END_OF_CELL ) {
 	    cur_pack= dsi_pack.dsi_gi.nv_pck_lbn +
 	    ( dsi_pack.vobu_sri.next_vobu & 0x3fffffff );
-	    MSG_V( "Navi  new pos=0x%X  \n",cur_pack);
+	    mpxp_v<<"Navi  new pos=0x"<<std::hex<<cur_pack<<std::endl;
 	} else {
 	    // end of cell! find next cell!
-	    MSG_V( "--- END OF CELL !!! ---\n");
+	    mpxp_v<<"--- END OF CELL !!! ---"<<std::endl;
 	    cur_pack=cell_last_pack+1;
 	}
     }
@@ -411,7 +403,7 @@
 	    //	== BLOCK_TYPE_ANGLE_BLOCK ) cur_cell+=dvd_angle;
 	    cur_pack = cur_pgc->cell_playback[ cur_cell ].first_sector;
 	    cell_last_pack=cur_pgc->cell_playback[ cur_cell ].last_sector;
-	    MSG_V( "DVD next cell: %d  pack: 0x%X-0x%X  \n",cur_cell,cur_pack,cell_last_pack);
+	    mpxp_v<<"DVD next cell: "<<cur_cell<<"  pack: 0x"<<std::hex<<cur_pack<<"-0x"<<std::hex<<cell_last_pack<<std::endl;
 	} else if(cur_title<last_title) {
 	    cur_title++;
 	    next_title(cur_title);
@@ -454,22 +446,19 @@
 	    > Invalid NAVIpacket! lba=30 gsi_navi=8002F pci_navi=8002F angle=0
 	*/
 	if(cur_pack != dsi_pack.dsi_gi.nv_pck_lbn){
-	    MSG_V( "Invalid NAVIpacket! lba=%X gsi_navi=%X pci_navi=%X angle=%X\n"
-		,cur_pack
-		,dsi_pack.dsi_gi.nv_pck_lbn
-		,pci_pack.pci_gi.nv_pck_lbn
-		,dsi_pack.sml_agli.data[dvd_angle].address
-		);
+	    mpxp_v<<"Invalid NAVIpacket! lba="<<std::hex<<cur_pack
+		<<" gsi_navi="<<std::hex<<dsi_pack.dsi_gi.nv_pck_lbn
+		<<" pci_navi="<<std::hex<<pci_pack.pci_gi.nv_pck_lbn
+		<<" angle=%"<<std::hex<<dsi_pack.sml_agli.data[dvd_angle].address<<std::endl;
 	} else {
 	    // process!
 	    vobu_s_pts=pci_pack.pci_gi.vobu_s_ptm/90000.;
 	    vobu_e_pts=pci_pack.pci_gi.vobu_e_ptm/90000.;
 	    packs_left = dsi_pack.dsi_gi.vobu_ea;
-	    MSG_V( "Found NAVI packet! lba=%X angle=%X len=%d vobu_s_pts=%f vobu_e_pts=%f\n"
-		,cur_pack,packs_left
-		,dsi_pack.sml_agli.data[dvd_angle].address
-		,vobu_s_pts,vobu_e_pts);
-
+	    mpxp_v<<"Found NAVI packet! lba="<<std::hex<<cur_pack
+		<<" angle="<<std::hex<<packs_left
+		<<" len="<<dsi_pack.sml_agli.data[dvd_angle].address
+		<<" vobu_s_pts="<<vobu_s_pts<<" vobu_e_pts="<<vobu_e_pts<<std::endl;
 	    if(angle_seek){
 		int skip=0;
 		unsigned i;
@@ -495,13 +484,13 @@
 		    cur_pack=dsi_pack.dsi_gi.nv_pck_lbn+
 				dsi_pack.sml_agli.data[dvd_angle].address;
 		    angle_seek=0;
-		    MSG_V("Angle-seek synced using sml_agli map!  new_lba=0x%X\n",cur_pack);
+		    mpxp_v<<"Angle-seek synced using sml_agli map!  new_lba=0x"<<std::hex<<cur_pack<<std::endl;
 		} else {
 		    // check if we're in the right cell, jump otherwise:
 		    if( (dsi_pack.dsi_gi.vobu_c_idn==cur_pgc->cell_position[cur_cell].cell_nr) &&
 			(dsi_pack.dsi_gi.vobu_vob_idn==cur_pgc->cell_position[cur_cell].vob_id_nr) ){
 			angle_seek=0;
-			MSG_V("Angle-seek synced by cell/vob IDN search!\n");
+			mpxp_v<<"Angle-seek synced by cell/vob IDN search!"<<std::endl;
 		    } else {
 			// wrong angle, skip this vobu:
 			cur_pack=dsi_pack.dsi_gi.nv_pck_lbn+
@@ -512,7 +501,7 @@
 	    }
 	    if(vobu_s_pts < vobu_e_pts) {
 		_stream_pts += vobu_e_pts-vobu_s_pts;
-		MSG_V("DVD's discontinuities found! Applying delta: %f\n",_stream_pts);
+		mpxp_v<<"DVD's discontinuities found! Applying delta: "<<_stream_pts<<std::endl;
 	    }
 	    else _stream_pts = vobu_s_pts;
 	}
@@ -572,8 +561,9 @@
 	_stream_pts=vobu_s_pts=vobu_e_pts=0.;
     }
 
-    MSG_V( "DVD Seek! lba=0x%X  cell=%d  packs: 0x%X-0x%X  \n",
-	cur_pack,cur_cell,cur_pgc->cell_playback[ cur_cell ].first_sector,cell_last_pack);
+    mpxp_v<<"DVD Seek! lba=0x"<<std::hex<<cur_pack
+	<<"  cell="<<cur_cell<<"  packs: 0x"<<std::hex<<cur_pgc->cell_playback[ cur_cell ].first_sector
+	<<"-0x"<<cell_last_pack<<std::endl;
 
     // if we're in interleaved multi-angle cell, find the right angle chain!
     // (read Navi block, and use the seamless angle jump table)
@@ -601,7 +591,7 @@
 
     last_title=-1;
     if(filename=="help" || filename.length()==10) {
-	MSG_HINT("Usage: dvdread://<@device>#<titleno>-<lasttitle>,<chapter>-<lastchapter>,<angle>\n");
+	mpxp_hint<<"Usage: dvdread://<@device>#<titleno>-<lasttitle>,<chapter>-<lastchapter>,<angle>"<<std::endl;
 	return MPXP_False;
     }
     args=mrl_parse_line(filename,NULL,NULL,&dvd_device,NULL);
@@ -630,12 +620,12 @@
      */
     dvd = DVDOpen(dvd_device?dvd_device:DEFAULT_DVD_DEVICE);
     if( !dvd ) {
-	MSG_ERR(MSGTR_CantOpenDVD,dvd_device?dvd_device:DEFAULT_DVD_DEVICE);
+	mpxp_err<<MSGTR_CantOpenDVD<<":"<<(dvd_device?dvd_device:DEFAULT_DVD_DEVICE)<<std::endl;
 	if(dvd_device) delete dvd_device;
 	return MPXP_False;
     }
     if(dvd_device) delete dvd_device;
-    MSG_V(MSGTR_DVDwait);
+    mpxp_v<<MSGTR_DVDwait<<std::endl;
 
     /**
      * Load the video manager to find out the information about the titles on
@@ -643,7 +633,7 @@
      */
     vmg_file = ifoOpen( dvd, 0 );
     if( !vmg_file ) {
-	MSG_ERR( "Can't open VMG info!\n");
+	mpxp_err<<"Can't open VMG info!"<<std::endl;
 	DVDClose( dvd );
 	return MPXP_False;
     }
@@ -651,10 +641,9 @@
     /**
      * Make sure our title number is valid.
      */
-    MSG_INFO( MSGTR_DVDnumTitles,
-	     tt_srpt->nr_of_srpts );
+    mpxp_info<<MSGTR_DVDnumTitles<<":"<<tt_srpt->nr_of_srpts<<std::endl;
     if( dvd_title < 1 || dvd_title > tt_srpt->nr_of_srpts ) {
-	MSG_ERR( MSGTR_DVDinvalidTitle, dvd_title);
+	mpxp_err<<MSGTR_DVDinvalidTitle<<":"<<dvd_title<<std::endl;
 	ifoClose( vmg_file );
 	DVDClose( dvd );
 	return MPXP_False;
@@ -665,17 +654,16 @@
     /**
      * Make sure the chapter number is valid for this title.
      */
-    MSG_INFO( MSGTR_DVDnumChapters,
-	     tt_srpt->title[dvd_title].nr_of_ptts );
+    mpxp_info<<MSGTR_DVDnumChapters<<":"<<tt_srpt->title[dvd_title].nr_of_ptts<<std::endl;
     if( dvd_chapter<1 || dvd_chapter>tt_srpt->title[dvd_title].nr_of_ptts ) {
-	MSG_ERR( MSGTR_DVDinvalidChapter, dvd_chapter);
+	mpxp_err<<MSGTR_DVDinvalidChapter<<":"<<dvd_chapter<<std::endl;
 	ifoClose( vmg_file );
 	DVDClose( dvd );
 	return MPXP_False;
     }
     if( dvd_last_chapter>0 ) {
 	if ( dvd_last_chapter<dvd_chapter || dvd_last_chapter>tt_srpt->title[dvd_title].nr_of_ptts ) {
-	    MSG_ERR( "Invalid DVD last chapter number: %d\n", dvd_last_chapter);
+	    mpxp_err<<"Invalid DVD last chapter number: "<<dvd_last_chapter<<std::endl;
 	    ifoClose( vmg_file );
 	    DVDClose( dvd );
 	    return MPXP_False;
@@ -686,10 +674,9 @@
     /**
      * Make sure the angle number is valid for this title.
      */
-    MSG_V( MSGTR_DVDnumAngles,
-	     tt_srpt->title[dvd_title].nr_of_angles );
+    mpxp_v<<MSGTR_DVDnumAngles<<":"<<tt_srpt->title[dvd_title].nr_of_angles<<std::endl;
     if( dvd_angle<1 || dvd_angle>tt_srpt->title[dvd_title].nr_of_angles ) {
-	MSG_ERR( MSGTR_DVDinvalidAngle, dvd_angle);
+	mpxp_err<<MSGTR_DVDinvalidAngle<<":"<<dvd_angle<<std::endl;
 	ifoClose( vmg_file );
 	DVDClose( dvd );
 	return MPXP_False;
@@ -708,7 +695,7 @@
 	_end_pos=(off_t)(cur_pgc->cell_playback[last_cell-1].last_sector)*2048;
     next_title(dvd_title);
 
-    MSG_V( MSGTR_DVDopenOk);
+    mpxp_ok<<MSGTR_DVDopenOk<<std::endl;
 
     spos=0;
     return MPXP_Ok;

Modified: mplayerxp/libmpstream2/s_file.cpp
===================================================================
--- mplayerxp/libmpstream2/s_file.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_file.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -53,7 +53,7 @@
     if(filename=="-") fd=0;
     else fd=::open(filename.c_str(),O_RDONLY);
     if(fd<0) {
-	MSG_ERR("[s_file] Cannot open file: '%s'\n",filename.c_str());
+	mpxp_err<<"[s_file] Cannot open file: "<<filename<<std::endl;
 	return MPXP_False;
     }
     was_open = (fd==0)?0:1;

Modified: mplayerxp/libmpstream2/s_ftp.cpp
===================================================================
--- mplayerxp/libmpstream2/s_ftp.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_ftp.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -117,12 +117,12 @@
 	    break;
 	}
 	if(!tcp.has_data(15)) {
-	    MSG_ERR("[ftp] read timed out\n");
+	    mpxp_err<<"[ftp] read timed out"<<std::endl;
 	    retval = -1;
 	    break;
 	}
 	if ((x = tcp.read((uint8_t*)cput,cleft)) == -1) {
-	    MSG_ERR("[ftp] read error: %s\n",strerror(errno));
+	    mpxp_err<<"[ftp] read error: "<<strerror(errno)<<std::endl;
 	    retval = -1;
 	    break;
 	}
@@ -151,7 +151,7 @@
     r = atoi(response)/100;
     if(rsp) strcpy(rsp,response);
 
-    MSG_V("[ftp] < %s",response);
+    mpxp_v<<"[ftp] < "<<response;
 
     if (response[3] == '-') {
 	strncpy(match,response,3);
@@ -159,10 +159,10 @@
 	match[4] = '\0';
 	do {
 	    if (readline(response,256) == -1) {
-		MSG_ERR("[ftp] Control socket read failed\n");
+		mpxp_err<<"[ftp] Control socket read failed"<<std::endl;
 		return 0;
 	    }
-	    MSG_V("[ftp] < %s",response);
+	    mpxp_v<<"[ftp] < "<<response;
 	} while (strncmp(response,match,4));
     }
     return r;
@@ -174,12 +174,12 @@
     int l = _cmd.length();
     int hascrlf = cmd[l - 2] == '\r' && cmd[l - 1] == '\n';
 
-    if(hascrlf && l == 2) MSG_V("\n");
-    else MSG_V("[ftp] > %s",cmd);
+    if(hascrlf && l == 2) mpxp_v<<std::endl;
+    else mpxp_v<<"[ftp] > "<<cmd;
     while(l > 0) {
 	int s = tcp.write((const uint8_t*)cmd,l);
 	if(s <= 0) {
-	    MSG_ERR("[ftp] write error: %s\n",strerror(errno));
+	    mpxp_err<<"[ftp] write error: "<<strerror(errno)<<std::endl;
 	    return 0;
 	}
 	cmd += s;
@@ -197,12 +197,12 @@
 
     resp = SendCmd("PASV",rsp_txt);
     if(resp != 2) {
-	MSG_WARN("[ftp] command 'PASV' failed: %s\n",rsp_txt);
+	mpxp_warn<<"[ftp] command 'PASV' failed: "<<rsp_txt<<std::endl;
 	return 0;
     }
     par = strchr(rsp_txt,'(');
     if(!par || !par[0] || !par[1]) {
-	MSG_ERR("[ftp] invalid server response: %s ??\n",rsp_txt);
+	mpxp_err<<"[ftp] invalid server response: "<<rsp_txt<<std::endl;
 	return 0;
     }
     sscanf(par+1,"%u,%u,%u,%u,%u,%u",&num[0],&num[1],&num[2],&num[3],&num[4],&num[5]);
@@ -210,7 +210,7 @@
     url.redirect(str);
     tcp.open(url);
 
-    if(!tcp.established()) MSG_ERR("[ftp] failed to create data connection\n");
+    if(!tcp.established()) mpxp_err<<"[ftp] failed to create data connection"<<std::endl;
     return 1;
 }
 
@@ -227,7 +227,7 @@
 	snprintf(str,255,"REST %"PRId64, (int64_t)newpos);
 	resp = SendCmd(str,rsp_txt);
 	if(resp != 3) {
-	    MSG_WARN("[ftp] command '%s' failed: %s\n",str,rsp_txt);
+	    mpxp_warn<<"[ftp] command '"<<str<<"' failed: "<<rsp_txt<<std::endl;
 	    newpos = 0;
 	}
     }
@@ -236,7 +236,7 @@
     resp = SendCmd(str,rsp_txt);
 
     if(resp != 1) {
-	MSG_ERR("[ftp] command '%s' failed: %s\n",str,rsp_txt);
+	mpxp_err<<"[ftp] command '"<<str<<"' failed: "<<rsp_txt<<std::endl;
 	return 0;
     }
     spos = newpos;
@@ -249,10 +249,10 @@
     if(!OpenData(spos)) return -1;
 
     if(!tcp.has_data(15)) {
-	MSG_ERR("[ftp] read timed out\n");
+	mpxp_err<<"[ftp] read timed out"<<std::endl;
 	return -1;
     }
-    MSG_V("ftp read: %u bytes\n",sp->len);
+    mpxp_v<<"ftp read: "<<sp->len<<" bytes"<<std::endl;
     r = tcp.read((uint8_t*)sp->buf,sp->len);
     spos+=r;
     return (r <= 0) ? -1 : r;
@@ -263,13 +263,13 @@
     char rsp_txt[256];
 
     if(spos==newpos) return spos;
-    MSG_V("ftp seek: %llu bytes\n",newpos);
+    mpxp_v<<"ftp seek: "<<newpos<<" bytes"<<std::endl;
     if(spos > file_len) return 0;
 
     // Check to see if the server did not already terminate the transfer
     if(tcp.has_data(0)) {
 	if(readresp(rsp_txt) != 2)
-	    MSG_WARN("[ftp] Warning the server didn't finished the transfer correctly: %s\n",rsp_txt);
+	    mpxp_warn<<"[ftp] Warning the server didn't finished the transfer correctly: "<<rsp_txt<<std::endl;
 	tcp.close();
     }
 
@@ -287,7 +287,7 @@
 	// Or the 226 Transfer complete
 	resp = readresp(rsp_txt);
 	if(resp != 4 && resp != 2) {
-	    MSG_ERR("[ftp] Server didn't abort correctly: %s\n",rsp_txt);
+	    mpxp_err<<"[ftp] Server didn't abort correctly: "<<rsp_txt<<std::endl;
 	    return 0;
 	}
 	// Send the ABOR command
@@ -322,15 +322,12 @@
 //  url = check4proxies (rurl);
     if(url.host().empty() && !url.file().empty()) {
 	bad_url:
-	MSG_ERR("[ftp] Bad url\n");
+	mpxp_err<<"[ftp] Bad url"<<std::endl;
 	return MPXP_False;
     }
     if(url.user().empty()) url.set_login("anonymous","no@spam");
     url.assign_port(21);
-    MSG_V("FTP: Opening ~%s :%s @%s :%i %s\n"
-	,url.user().c_str(),url.password().c_str(),url.host().c_str(),
-	url.port(),url.file().c_str());
-
+    mpxp_v<<"FTP: Opening ~"<<url.user()<<" :"<<url.password()<<" @"<<url.host()<<" :"<<url.port()<<" "<<url.file()<<std::endl;
     // Open the control connection
     tcp.open(url);
 
@@ -351,12 +348,12 @@
 	snprintf(str,255,"PASS %s",url.password().c_str());
 	resp = SendCmd(str,rsp_txt);
 	if(resp != 2) {
-	    MSG_ERR("[ftp] command '%s' failed: %s\n",str,rsp_txt);
+	    mpxp_err<<"[ftp] command '"<<str<<"' failed: "<<rsp_txt<<std::endl;
 	    close();
 	    return MPXP_False;
 	}
     } else if(resp != 2) {
-	MSG_ERR("[ftp] command '%s' failed: %s\n",str,rsp_txt);
+	mpxp_err<<"[ftp] command '"<<str<<"' failed: "<<rsp_txt<<std::endl;
 	close();
 	return MPXP_False;
     }
@@ -364,7 +361,7 @@
     // Set the transfer type
     resp = SendCmd("TYPE I",rsp_txt);
     if(resp != 2) {
-	MSG_ERR("[ftp] command 'TYPE I' failed: %s\n",rsp_txt);
+	mpxp_err<<"[ftp] command 'TYPE I' failed: "<<rsp_txt<<std::endl;
 	close();
 	return MPXP_False;
     }
@@ -372,14 +369,14 @@
     // Get System of FTP
     resp = SendCmd("SYST",rsp_txt);
     if(resp != 2) {
-	MSG_ERR("[ftp] command 'SYST' failed: %s\n",rsp_txt);
+	mpxp_err<<"[ftp] command 'SYST' failed: "<<rsp_txt<<std::endl;
 	close();
 	return MPXP_False;
     }
-    MSG_INFO("[ftp] System: %s\n",rsp_txt);
+    mpxp_info<<"[ftp] System: "<<rsp_txt<<std::endl;
     resp = SendCmd("STAT",rsp_txt);
     if(resp != 2) {
-	MSG_ERR("[ftp] command 'STAT' failed: %s\n",rsp_txt);
+	mpxp_err<<"[ftp] command 'STAT' failed: "<<rsp_txt<<std::endl;
 	close();
 	return MPXP_False;
     }
@@ -389,7 +386,7 @@
     snprintf(str,255,"SIZE %s",url.file().c_str());
     resp = SendCmd(str,rsp_txt);
     if(resp != 2) {
-	MSG_WARN("[ftp] command '%s' failed: %s\n",str,rsp_txt);
+	mpxp_warn<<"[ftp] command '"<<str<<"' failed: "<<rsp_txt<<std::endl;
     } else {
 	int dummy;
 	sscanf(rsp_txt,"%d %"PRId64,&dummy,&file_len);

Modified: mplayerxp/libmpstream2/s_lavc.cpp
===================================================================
--- mplayerxp/libmpstream2/s_lavc.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_lavc.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -73,7 +73,7 @@
 
     UNUSED(flags);
     av_register_all();
-    MSG_V("[lavc] Opening %s\n", filename.c_str());
+    mpxp_v<<"[lavc] Opening "<<filename<<std::endl;
 
     if (ffurl_open(&ctx, filename.c_str(), 0, &int_cb, NULL) < 0) return MPXP_False;
     spos = 0;

Modified: mplayerxp/libmpstream2/s_network.cpp
===================================================================
--- mplayerxp/libmpstream2/s_network.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_network.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -53,10 +53,10 @@
     UNUSED(flags);
     if(url.redirect(filename)==MPXP_Ok) {
 	if((networking=Networking::start(tcp,url))==NULL){
-	    MSG_ERR(MSGTR_UnableOpenURL, filename.c_str());
+	    mpxp_err<<MSGTR_UnableOpenURL<<":"<<filename<<std::endl;
 	    return MPXP_False;
 	}
-	MSG_INFO(MSGTR_ConnToServer, url.host().c_str());
+	mpxp_info<<MSGTR_ConnToServer<<":"<<url.host()<<std::endl;
 	spos = 0;
 	return MPXP_Ok;
     }
@@ -82,7 +82,7 @@
     if(networking!=NULL) {
 	newpos=networking->seek(tcp, pos);
 	if( newpos<0 ) {
-	    MSG_WARN("Stream not seekable!\n");
+	    mpxp_warn<<"Stream not seekable!"<<std::endl;
 	    return 1;
 	}
     }

Modified: mplayerxp/libmpstream2/s_oss.cpp
===================================================================
--- mplayerxp/libmpstream2/s_oss.cpp	2012-12-21 15:12:47 UTC (rev 593)
+++ mplayerxp/libmpstream2/s_oss.cpp	2012-12-21 17:47:42 UTC (rev 594)
@@ -64,7 +64,7 @@
     int err;
     UNUSED(flags);
     if(filename=="help") {
-	MSG_HINT("Usage: oss://<@device>#<channels>,<samplerate>,<sampleformat>\n");
+	mpxp_hint<<"Usage: oss://<@device>#<channels>,<samplerate>,<sampleformat>"<<std::endl;
 	return MPXP_False;
     }
     args=mp_strdup(mrl_parse_line(filename,NULL,NULL,&oss_device,NULL));
@@ -93,9 +93,9 @@
     tmp = samplerate;
     err=0;
     if (::ioctl(fd, SNDCTL_DSP_SPEED, &samplerate)<0)
-	MSG_ERR("[s_oss] Can't set samplerate to %u (will use %u)\n",tmp,samplerate);
+	mpxp_err<<"[s_oss] Can't set samplerate to "<<tmp<<" (will use "<<samplerate<<")"<<std::endl;
     else
-	MSG_DBG2("[o_oss] Did set samplerate to %u\n",samplerate);
+	mpxp_dbg2<<"[o_oss] Did set samplerate to "<<samplerate<<std::endl;
     tmp = nchannels;
     if(tmp>2)
 	err=::ioctl(fd, SNDCTL_DSP_CHANNELS, &nchannels);
@@ -104,8 +104,8 @@
 	err=::ioctl(fd, SNDCTL_DSP_STEREO, &param);
 	nchannels=param?2:1;
     }
-    if(err<0) MSG_ERR("[s_oss] Can't set channels to %u (will use %u)\n",tmp,nchannels);
-    else MSG_DBG2("[o_oss] Did set channels to %u\n",nchannels);
+    if(err<0) mpxp_err<<"[s_oss] Can't set channels to "<<tmp<<" (will use "<<nchannels<<")"<<std::endl;
+    else mpxp_dbg2<<"[o_oss] Did set channels to "<<nchannels<<std::endl;
     mp_aframe_t afd;
     int oss_fmt;
     afd.rate=samplerate;
@@ -114,27 +114,27 @@
     oss_fmt=mpaf2afmt(sampleformat);
     tmp=oss_fmt;
     if(::ioctl(fd, SNDCTL_DSP_SETFMT, &oss_fmt)<0)
-	MSG_ERR("[s_oss] Can't set format %s (will use %s)\n",ao_format_name(tmp),ao_format_name(oss_fmt));
+	mpxp_err<<"[s_oss] Can't set format "<<ao_format_name(tmp)<<" (will use "<<ao_format_name(oss_fmt)<<")"<<std::endl;
     else
-	MSG_DBG2("[o_oss] Did set format to %s\n",ao_format_name(oss_fmt));
+	mpxp_dbg2<<"[o_oss] Did set format to "<<ao_format_name(oss_fmt)<<std::endl;
     tmp = PCM_ENABLE_INPUT;
     if(::ioctl(fd, SNDCTL_DSP_SETTRIGGER, &tmp)<0)
-	MSG_ERR("[s_oss] Can't enable input\n");
+	mpxp_err<<"[s_oss] Can't enable input"<<std::endl;
     else
-	MSG_DBG2("[o_oss] Did set trigger to %u\n",tmp);
+	mpxp_dbg2<<"[o_oss] Did set trigger to "<<tmp<<std::endl;
     _sector_size = 0;
     err = ::ioctl(fd, SNDCTL_DSP_GETBLKSIZE, &_sector_size);
     if (err < 0)
-	MSG_ERR("[s_oss] Can't get blocksize\n");
+	mpxp_err<<"[s_oss] Can't get blocksize"<<std::endl;
     else
-	MSG_DBG2("[o_oss] Did get blocksize as %u\n",_sector_size);
+	mpxp_dbg2<<"[o_oss] Did get blocksize as "<<_sector_size<<std::endl;
     // correct the blocksize to a reasonable value
     if (_sector_size <= 0) {
 	_sector_size = 4096*nchannels*(sampleformat&MPAF_BPS_MASK);
     } else if (_sector_size < 4096*nchannels*(sampleformat&MPAF_BPS_MASK)) {
 	_sector_size *= 4096*nchannels*(sampleformat&MPAF_BPS_MASK)/_sector_size;
     }
-    MSG_DBG2("[o_oss] Correct blocksize as %u\n",_sector_size);
+   ...
 
[truncated message content]