Index: stream/cdinfo.c
===================================================================
--- stream/cdinfo.c	(revision 25392)
+++ stream/cdinfo.c	(working copy)
@@ -114,20 +114,20 @@
 void
 cd_info_debug(cd_info_t *cd_info) {
 	cd_track_t *current_track;
-	printf("================ CD INFO === start =========\n");
+	mp_msg(MSGT_DEMUX, MSGL_INFO, "================ CD INFO === start =========\n");
 	if( cd_info==NULL ) {
-		printf("cd_info is NULL\n");
+		mp_msg(MSGT_DEMUX, MSGL_INFO, "cd_info is NULL\n");
 		return;
 	}
-	printf(" artist=[%s]\n", cd_info->artist);
-	printf(" album=[%s]\n", cd_info->album);
-	printf(" genre=[%s]\n", cd_info->genre);
-	printf(" nb_tracks=%d\n", cd_info->nb_tracks);
-	printf(" length= %2d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec);
+	mp_msg(MSGT_DEMUX, MSGL_INFO, " artist=[%s]\n", cd_info->artist);
+	mp_msg(MSGT_DEMUX, MSGL_INFO, " album=[%s]\n", cd_info->album);
+	mp_msg(MSGT_DEMUX, MSGL_INFO, " genre=[%s]\n", cd_info->genre);
+	mp_msg(MSGT_DEMUX, MSGL_INFO, " nb_tracks=%d\n", cd_info->nb_tracks);
+	mp_msg(MSGT_DEMUX, MSGL_INFO, " length= %2d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec);
 	current_track = cd_info->first;
 	while( current_track!=NULL ) {
-		printf("  #%2d %2d:%02d.%02d @ %7ld\t[%s] \n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec, current_track->frame_begin, current_track->name);
+		mp_msg(MSGT_DEMUX, MSGL_INFO, "  #%2d %2d:%02d.%02d @ %7ld\t[%s] \n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec, current_track->frame_begin, current_track->name);
 		current_track = current_track->next;
 	}
-	printf("================ CD INFO ===  end  =========\n");
+	mp_msg(MSGT_DEMUX, MSGL_INFO, "================ CD INFO ===  end  =========\n");
 }