Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Sync with MESS (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2012-08-20 06:06:19 +00:00
parent c35e90545c
commit 1c13d14099
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/formats/x1_tap.c
View File

@ -26,6 +26,7 @@
static int cas_size; static int cas_size;
static int samplerate; static int samplerate;
static int new_format;
static int x1_fill_wave(INT16* buffer, UINT8 data, int sample_pos) static int x1_fill_wave(INT16* buffer, UINT8 data, int sample_pos)
{ {
@ -46,22 +47,17 @@ static int x1_fill_wave(INT16* buffer, UINT8 data, int sample_pos)
static int x1_handle_tap(INT16* buffer, const UINT8* casdata) static int x1_handle_tap(INT16* buffer, const UINT8* casdata)
{ {
int sample_count = 0; int sample_count = 0;
int data_pos = 0x28; int data_pos = new_format ? 0x28 : 0x04;
if(memcmp(casdata, "TAPE",4)) // header check if (samplerate != 8000)
{
LOG_FORMATS("TAP: image is not a 'new' format TAP image\n");
return -1;
}
if(samplerate != 8000)
{ {
LOG_FORMATS("TAP: images that are not 8000Hz are not yet supported\n"); LOG_FORMATS("TAP: images that are not 8000Hz are not yet supported\n");
return -1; return -1;
} }
while(sample_count < cas_size) while (sample_count < cas_size)
{ {
sample_count += x1_fill_wave(buffer,casdata[data_pos],sample_count); sample_count += x1_fill_wave(buffer, casdata[data_pos], sample_count);
data_pos++; data_pos++;
} }
@ -75,11 +71,23 @@ static int x1_cas_to_wav_size (const UINT8 *casdata, int caslen)
{ {
UINT32 ret; UINT32 ret;
ret = casdata[0x20] | (casdata[0x21] << 8) | (casdata[0x22] << 16) | (casdata[0x23] << 24); if (!memcmp(casdata, "TAPE", 4)) // new TAP format
cas_size = ret; {
ret = casdata[0x20] | (casdata[0x21] << 8) | (casdata[0x22] << 16) | (casdata[0x23] << 24);
samplerate = casdata[0x1c] | (casdata[0x1d] << 8) | (casdata[0x1e] << 16) | (casdata[0x1f] << 24); cas_size = ret;
samplerate = casdata[0x1c] | (casdata[0x1d] << 8) | (casdata[0x1e] << 16) | (casdata[0x1f] << 24);
new_format = 1;
}
else // old TAP format
{
ret = (caslen - 4) * 8; // each byte = 8 samples
cas_size = ret;
samplerate = casdata[0x00] | (casdata[0x01] << 8) | (casdata[0x02] << 16) | (casdata[0x03] << 24);
new_format = 0;
}
return ret; return ret;
} }