From 6fa2c52589254d7c43901acbcbb9bc837bcb2043 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 26 Mar 2014 16:55:27 +0100 Subject: stream_cdda: remove unused stuff This cd_info_t struct was practically unused. The only thing it did was storing the track name of the form "Track %d" in a very roundabout way. Remove it. (It made more sense when there was still CDDB support.) --- stream/cdinfo.c | 154 -------------------------------------------------------- 1 file changed, 154 deletions(-) delete mode 100644 stream/cdinfo.c (limited to 'stream/cdinfo.c') diff --git a/stream/cdinfo.c b/stream/cdinfo.c deleted file mode 100644 index 2e6e34b1be..0000000000 --- a/stream/cdinfo.c +++ /dev/null @@ -1,154 +0,0 @@ -/* - * CD Info - * - * Copyright (C) 2002 Bertrand Baudet - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include -#include -#include "common/msg.h" -#include "cdd.h" - -/******************************************************************************************************************* - * - * xmcd parser, cd info list - * - *******************************************************************************************************************/ - -cd_info_t* -cd_info_new(void) { - cd_info_t *cd_info = NULL; - - cd_info = malloc(sizeof(cd_info_t)); - if( cd_info==NULL ) { - return NULL; - } - - memset(cd_info, 0, sizeof(cd_info_t)); - - return cd_info; -} - -void -cd_info_free(cd_info_t *cd_info) { - cd_track_t *cd_track, *cd_track_next; - if( cd_info==NULL ) return; - free(cd_info->artist); - free(cd_info->album); - free(cd_info->genre); - - cd_track_next = cd_info->first; - while( cd_track_next!=NULL ) { - cd_track = cd_track_next; - cd_track_next = cd_track->next; - free(cd_track->name); - free(cd_track); - } -} - -cd_track_t* -cd_info_add_track(cd_info_t *cd_info, char *track_name, unsigned int track_nb, unsigned int min, unsigned int sec, unsigned int msec, unsigned long frame_begin, unsigned long frame_length) { - cd_track_t *cd_track; - - if( cd_info==NULL || track_name==NULL ) return NULL; - - cd_track = malloc(sizeof(cd_track_t)); - if( cd_track==NULL ) { - return NULL; - } - memset(cd_track, 0, sizeof(cd_track_t)); - - cd_track->name = malloc(strlen(track_name)+1); - if( cd_track->name==NULL ) { - free(cd_track); - return NULL; - } - strcpy(cd_track->name, track_name); - cd_track->track_nb = track_nb; - cd_track->min = min; - cd_track->sec = sec; - cd_track->msec = msec; - cd_track->frame_begin = frame_begin; - cd_track->frame_length = frame_length; - - if( cd_info->first==NULL ) { - cd_info->first = cd_track; - } - if( cd_info->last!=NULL ) { - cd_info->last->next = cd_track; - } - - cd_track->prev = cd_info->last; - - cd_info->last = cd_track; - cd_info->current = cd_track; - - cd_info->nb_tracks++; - - return cd_track; -} - -cd_track_t* -cd_info_get_track(cd_info_t *cd_info, unsigned int track_nb) { - cd_track_t *cd_track=NULL; - - if( cd_info==NULL ) return NULL; - - cd_track = cd_info->first; - while( cd_track!=NULL ) { - if( cd_track->track_nb==track_nb ) { - return cd_track; - } - cd_track = cd_track->next; - } - return NULL; -} - -void cd_info_debug(cd_info_t *cd_info, struct mp_log *log) -{ - cd_track_t *current_track; - mp_info(log, "================ CD INFO === start =========\n"); - if( cd_info==NULL ) { - mp_info(log, "cd_info is NULL\n"); - return; - } - 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_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_info(log, "================ CD INFO === end =========\n"); -} -- cgit v1.2.3