Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-21 05:08:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

chdman: Properly handle and warn on bin/cue output of images with subcode data [R. Belmont]

Browse Source
This commit is contained in:
R. Belmont 2012-02-26 18:23:18 +00:00
parent 939ed1febe
commit 782c568876
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/tools/chdman.c
View File

@ -2240,8 +2240,23 @@ static void do_extract_cd(parameters_t &params)
const cdrom_track_info &trackinfo = toc->tracks[tracknum]; const cdrom_track_info &trackinfo = toc->tracks[tracknum];
output_track_metadata(cuemode, output_toc_file, tracknum, trackinfo, *output_bin_file_str, discoffs, outputoffs); output_track_metadata(cuemode, output_toc_file, tracknum, trackinfo, *output_bin_file_str, discoffs, outputoffs);
UINT32 output_frame_size;
// If this is bin/cue output and the CHD contains subdata, warn the user and don't include
// the subdata size in the buffer calculation.
if ((trackinfo.subtype != CD_SUB_NONE) && (cuemode))
{
printf("Warning: Track %d has subcode data. bin/cue format cannot contain subcode data and it will be omitted.\n", tracknum+1);
printf(" : This may affect usage of the output image. Use bin/toc output to keep all data.\n");
output_frame_size = trackinfo.datasize;
}
else
{
output_frame_size = trackinfo.datasize + ((trackinfo.subtype != CD_SUB_NONE) ? trackinfo.subsize : 0);
}
// resize the buffer for the track // resize the buffer for the track
UINT32 output_frame_size = trackinfo.datasize + ((trackinfo.subtype != CD_SUB_NONE) ? trackinfo.subsize : 0);
buffer.resize((TEMP_BUFFER_SIZE / output_frame_size) * output_frame_size); buffer.resize((TEMP_BUFFER_SIZE / output_frame_size) * output_frame_size);
// now read and output the actual data // now read and output the actual data
@ -2265,10 +2280,10 @@ static void do_extract_cd(parameters_t &params)
discoffs++; discoffs++;
// read the subcode data // read the subcode data
if (trackinfo.subtype != CD_SUB_NONE) if ((trackinfo.subtype != CD_SUB_NONE) && (!cuemode))
{ {
cdrom_read_subcode(cdrom, cdrom_get_track_start(cdrom, tracknum) + frame, &buffer[bufferoffs]); cdrom_read_subcode(cdrom, cdrom_get_track_start(cdrom, tracknum) + frame, &buffer[bufferoffs]);
bufferoffs += trackinfo.subsize; bufferoffs += trackinfo.subsize;
} }
// write it out if we need to // write it out if we need to