[MPlayer-cvslog] CVS: main/libmpdemux cache2.c, 1.34, 1.35 cddb.c, 1.23, 1.24 demux_audio.c, 1.52, 1.53 demux_demuxers.c, 1.10, 1.11 demux_film.c, 1.18, 1.19 demux_mov.c, 1.145, 1.146 demux_nuv.c, 1.19, 1.20 demux_real.c, 1.95, 1.96 demux_xmms.c, 1.15, 1.16 stream.c, 1.88, 1.89 tvi_v4l2.c, 1.38, 1.39
Reynaldo H. Verdejo CVS
syncmail at mplayerhq.hu
Sat Apr 22 07:12:13 CEST 2006
CVS change done by Reynaldo H. Verdejo CVS
Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv23908/libmpdemux
Modified Files:
cache2.c cddb.c demux_audio.c demux_demuxers.c demux_film.c
demux_mov.c demux_nuv.c demux_real.c demux_xmms.c stream.c
tvi_v4l2.c
Log Message:
Part3 of Otvos Attila's oattila AT chello-hu mp_msg changes, with lots of modifications as usual
Index: cache2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cache2.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- cache2.c 9 Apr 2006 18:16:29 -0000 1.34
+++ cache2.c 22 Apr 2006 05:12:10 -0000 1.35
@@ -64,8 +64,8 @@
void cache_stats(cache_vars_t* s){
int newb=s->max_filepos-s->read_filepos; // new bytes in the buffer
- printf("0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
- printf("%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
+ mp_msg(MSGT_CACHE,MSGL_INFO,"0x%06X [0x%06X] 0x%06X ",(int)s->min_filepos,(int)s->read_filepos,(int)s->max_filepos);
+ mp_msg(MSGT_CACHE,MSGL_INFO,"%3d %% (%3d%%)\n",100*newb/s->buffer_size,100*min_fill/s->buffer_size);
}
int cache_read(cache_vars_t* s,unsigned char* buf,int size){
Index: cddb.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/cddb.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cddb.c 20 Jan 2006 22:44:12 -0000 1.23
+++ cddb.c 22 Apr 2006 05:12:10 -0000 1.24
@@ -282,7 +282,7 @@
if( reply_parser==NULL || command==NULL || cddb_data==NULL ) return -1;
sprintf( request, "http://%s/~cddb/cddb.cgi?cmd=%s%s&proto=%d", cddb_data->freedb_server, command, cddb_data->cddb_hello, cddb_data->freedb_proto_level );
- printf("Request[%s]\n", request );
+ mp_msg(MSGT_OPEN, MSGL_INFO,"Request[%s]\n", request );
url = url_new(request);
if( url==NULL ) {
@@ -303,7 +303,7 @@
}
http_debug_hdr(http_hdr);
- printf("body=[%s]\n", http_hdr->body );
+ mp_msg(MSGT_OPEN, MSGL_INFO,"body=[%s]\n", http_hdr->body );
switch(http_hdr->status_code) {
case 200:
Index: demux_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_audio.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- demux_audio.c 16 Apr 2006 13:45:21 -0000 1.52
+++ demux_audio.c 22 Apr 2006 05:12:10 -0000 1.53
@@ -1,6 +1,7 @@
#include "config.h"
#include "mp_msg.h"
+#include "help_mp.h"
#include <stdlib.h>
#include <stdio.h>
@@ -615,7 +616,7 @@
break;
}
default:
- printf("Audio demuxer : unknown format %d\n",priv->frmt);
+ mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_MPDEMUX_AUDIO_UnknownFormat,priv->frmt);
return 0;
}
Index: demux_demuxers.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_demuxers.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- demux_demuxers.c 17 Feb 2006 01:57:40 -0000 1.10
+++ demux_demuxers.c 22 Apr 2006 05:12:10 -0000 1.11
@@ -1,5 +1,7 @@
#include "config.h"
+#include "mp_msg.h"
+#include "help_mp.h"
#include <stdlib.h>
#include <stdio.h>
@@ -53,7 +55,7 @@
else if(ds->demuxer == priv->sd)
return demux_fill_buffer(priv->sd,ds);
- printf("Demux demuxers fill_buffer error : bad demuxer : not vd, ad nor sd\n");
+ mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_MPDEMUX_DEMUXERS_FillBufferError);
return 0;
}
Index: demux_film.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_film.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- demux_film.c 10 Mar 2006 23:51:41 -0000 1.18
+++ demux_film.c 22 Apr 2006 05:12:10 -0000 1.19
@@ -57,7 +57,7 @@
new_current_chunk += rel_seek_secs * film_data->chunks_per_second; // secs
-printf ("current, total chunks = %d, %d; seek %5.3f sec, new chunk guess = %d\n",
+mp_msg(MSGT_DECVIDEO, MSGL_INFO,"current, total chunks = %d, %d; seek %5.3f sec, new chunk guess = %d\n",
film_data->current_chunk, film_data->total_chunks,
rel_seek_secs, new_current_chunk);
@@ -74,7 +74,7 @@
film_data->current_chunk = new_current_chunk;
-printf (" (flags = %X) actual new chunk = %d (syncinfo1 = %08X)\n",
+mp_msg(MSGT_DECVIDEO, MSGL_INFO," (flags = %X) actual new chunk = %d (syncinfo1 = %08X)\n",
flags, film_data->current_chunk, film_data->chunks[film_data->current_chunk].syncinfo1);
demuxer->video->pts=film_data->chunks[film_data->current_chunk].pts;
@@ -289,7 +289,7 @@
stream_skip(demuxer->stream, 8);
if(demuxer->audio->id<-1){
- printf("chunk size = 0x%X \n",chunk_size);
+ mp_msg(MSGT_DECVIDEO, MSGL_INFO,"chunk size = 0x%X \n",chunk_size);
stream_skip(demuxer->stream, chunk_size-12-8);
break; // audio disabled (or no soundcard)
}
Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- demux_mov.c 27 Mar 2006 21:37:18 -0000 1.145
+++ demux_mov.c 22 Apr 2006 05:12:10 -0000 1.146
@@ -1047,7 +1047,7 @@
sh->aspect/=trak->tkdata[81]|(trak->tkdata[80]<<8);
}
- if(depth>32+8) printf("*** depth = 0x%X\n",depth);
+ if(depth>32+8) mp_msg(MSGT_DEMUX, MSGL_INFO,"*** depth = 0x%X\n",depth);
// palettized?
gray = 0;
Index: demux_nuv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_nuv.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- demux_nuv.c 17 Feb 2006 01:57:40 -0000 1.19
+++ demux_nuv.c 22 Apr 2006 05:12:10 -0000 1.20
@@ -331,7 +331,7 @@
/* no video */
if (rtjpeg_fileheader.videoblocks == 0)
{
- printf("No video blocks in file\n");
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_MPDEMUX_NUV_NoVideoBlocksInFile);
return NULL;
}
Index: demux_real.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_real.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- demux_real.c 15 Apr 2006 21:09:29 -0000 1.95
+++ demux_real.c 22 Apr 2006 05:12:10 -0000 1.96
@@ -1225,7 +1225,7 @@
descr = malloc(len+1);
stream_read(demuxer->stream, descr, len);
descr[len] = 0;
- printf("Stream description: %s\n", descr);
+ mp_msg(MSGT_DEMUX, MSGL_INFO,"Stream description: %s\n", descr);
free(descr);
}
// skip_str(1, demuxer); /* mimetype */
@@ -1233,7 +1233,7 @@
mimet = malloc(len+1);
stream_read(demuxer->stream, mimet, len);
mimet[len] = 0;
- printf("Stream mimetype: %s\n", mimet);
+ mp_msg(MSGT_DEMUX, MSGL_INFO,"Stream mimetype: %s\n", mimet);
}
/* Type specific header */
Index: demux_xmms.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_xmms.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- demux_xmms.c 17 Feb 2006 01:57:41 -0000 1.15
+++ demux_xmms.c 22 Apr 2006 05:12:10 -0000 1.16
@@ -18,6 +18,9 @@
#include "demuxer.h"
#include "stheader.h"
+#include "mp_msg.h"
+#include "help_mp.h"
+
#define XMMS_PACKETSIZE 65536 // some plugins won't play if this is too small
#include "demux_xmms_plugin.h"
@@ -171,7 +174,7 @@
gpi=dlsym(handle, "get_iplugin_info");
if(gpi){
InputPlugin *p=gpi();
- printf("XMMS: found plugin: %s (%s)\n",ent->d_name,p->description);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_XMMS_FoundPlugin,ent->d_name,p->description);
p->handle = handle;
p->filename = strdup(filename);
p->get_vis_type = input_get_vis_type;
@@ -190,7 +193,7 @@
static void cleanup_plugins(){
while(no_plugins>0){
--no_plugins;
- printf("XMMS: Closing plugin %s\n",input_plugins[no_plugins]->filename);
+ mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_MPDEMUX_XMMS_ClosingPlugin,input_plugins[no_plugins]->filename);
if(input_plugins[no_plugins]->cleanup)
input_plugins[no_plugins]->cleanup();
dlclose(input_plugins[no_plugins]->handle);
Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- stream.c 24 Mar 2006 08:12:02 -0000 1.88
+++ stream.c 22 Apr 2006 05:12:10 -0000 1.89
@@ -271,7 +271,7 @@
}
if( mp_msg_test(MSGT_STREAM,MSGL_DBG3) ){
- printf("s->pos=%"PRIX64" newpos=%"PRIX64" new_bufpos=%"PRIX64" buflen=%X \n",
+ mp_msg(MSGT_STREAM,MSGL_DBG3, "s->pos=%"PRIX64" newpos=%"PRIX64" new_bufpos=%"PRIX64" buflen=%X \n",
(int64_t)s->pos,(int64_t)newpos,(int64_t)pos,s->buf_len);
}
pos-=newpos;
Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- tvi_v4l2.c 11 Apr 2006 10:19:53 -0000 1.38
+++ tvi_v4l2.c 22 Apr 2006 05:12:10 -0000 1.39
@@ -1031,7 +1031,7 @@
standard.index = i;
if (-1 == ioctl(priv->video_fd, VIDIOC_ENUMSTD, &standard))
break;
- printf(" %d = %s;", i, standard.name);
+ mp_msg(MSGT_TV, MSGL_INFO, " %d = %s;", i, standard.name);
}
mp_msg(MSGT_TV, MSGL_INFO, "\n inputs:");
for (i = 0; 1; i++) {
More information about the MPlayer-cvslog
mailing list