From 0335011f11d9d13f70db6c46ed6189a74d48ec67 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:36:45 +0100 Subject: stream: mp_msg conversions We also drop some slave mode stuff from stream_vcd. --- stream/cdinfo.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) (limited to 'stream/cdinfo.c') diff --git a/stream/cdinfo.c b/stream/cdinfo.c index 6398809a0a..2e6e34b1be 100644 --- a/stream/cdinfo.c +++ b/stream/cdinfo.c @@ -40,7 +40,6 @@ cd_info_new(void) { cd_info = malloc(sizeof(cd_info_t)); if( cd_info==NULL ) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "Memory allocation failed.\n"); return NULL; } @@ -74,14 +73,12 @@ cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, u cd_track = malloc(sizeof(cd_track_t)); if( cd_track==NULL ) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "Memory allocation failed.\n"); return NULL; } memset(cd_track, 0, sizeof(cd_track_t)); cd_track->name = malloc(strlen(track_name)+1); if( cd_track->name==NULL ) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "Memory allocation failed.\n"); free(cd_track); return NULL; } @@ -126,32 +123,32 @@ cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb) { return NULL; } -void -cd_info_debug(cd_info_t *cd_info) { +void cd_info_debug(cd_info_t *cd_info, struct mp_log *log) +{ cd_track_t *current_track; - mp_msg(MSGT_DEMUX, MSGL_INFO, "================ CD INFO === start =========\n"); + mp_info(log, "================ CD INFO === start =========\n"); if( cd_info==NULL ) { - mp_msg(MSGT_DEMUX, MSGL_INFO, "cd_info is NULL\n"); + mp_info(log, "cd_info is NULL\n"); return; } - 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); - - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_ARTIST=%s\n", cd_info->artist); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_ALBUM=%s\n", cd_info->album); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_GENRE=%s\n", cd_info->genre); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_LENGTH_MSF=%02d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_TRACKS=%d\n", cd_info->nb_tracks); + mp_info(log, " artist=[%s]\n", cd_info->artist); + mp_info(log, " album=[%s]\n", cd_info->album); + mp_info(log, " genre=[%s]\n", cd_info->genre); + mp_info(log, " nb_tracks=%d\n", cd_info->nb_tracks); + mp_info(log, " length= %2d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec); + + mp_info(log, "ID_CDDB_INFO_ARTIST=%s\n", cd_info->artist); + mp_info(log, "ID_CDDB_INFO_ALBUM=%s\n", cd_info->album); + mp_info(log, "ID_CDDB_INFO_GENRE=%s\n", cd_info->genre); + mp_info(log, "ID_CDDB_INFO_LENGTH_MSF=%02d:%02d.%02d\n", cd_info->min, cd_info->sec, cd_info->msec); + mp_info(log, "ID_CDDB_INFO_TRACKS=%d\n", cd_info->nb_tracks); current_track = cd_info->first; while( current_track!=NULL ) { - 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); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_TRACK_%d_NAME=%s\n", current_track->track_nb, current_track->name); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CDDB_INFO_TRACK_%d_MSF=%02d:%02d.%02d\n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec); + mp_info(log, " #%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_info(log, "ID_CDDB_INFO_TRACK_%d_NAME=%s\n", current_track->track_nb, current_track->name); + mp_info(log, "ID_CDDB_INFO_TRACK_%d_MSF=%02d:%02d.%02d\n", current_track->track_nb, current_track->min, current_track->sec, current_track->msec); current_track = current_track->next; } - mp_msg(MSGT_DEMUX, MSGL_INFO, "================ CD INFO === end =========\n"); + mp_info(log, "================ CD INFO === end =========\n"); } -- cgit v1.2.3