mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-04-05 21:52:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

S3M+IT: fix reading, IT: untested support for message writing

Browse Source 
IT: reading was off starting with global volume because of wrong read size.
S3M+IT: correctly read the number of used patterns.
IT: fixed reading of message tag and implemented writing of message tag
(not tested yet).

I also added S3M+IT test files. TODO: Unit tests using them.
This commit is contained in:
Mathias Panzenböck
2011-06-23 05:41:23 +02:00
parent e202c658f0
commit 7236ef4d0f
9 changed files with 127 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
taglib/s3m/s3mfile.cpp
View File

@ -143,7 +143,6 @@ void S3M::File::read(bool)
READ_U16L_AS(length);
READ_U16L_AS(sampleCount);
d->properties.setTableLength(length);
d->properties.setSampleCount(sampleCount);
READ_U16L(d->properties.setPatternCount);
@ -177,12 +176,23 @@ void S3M::File::read(bool)
if(setting != 0xff) ++ channels;
}
d->properties.setChannels(channels);
seek(96);
ushort realLength = 0;
for(ushort i = 0; i < length; ++ i)
{
READ_BYTE_AS(order);
if(order == 255) break;
if(order != 254) ++ realLength;
}
d->properties.setTableLength(realLength);
seek(channels, Current);
// Note: The S3M spec mentions instruments, but I could
// not figure out where these can be found. They are
// similar to samples, though (SCRI instead of SCRS).
// Note: The S3M spec mentions samples and instruments, but in
// the header there are only pointers to instruments.
// However, there I never found instruments (SCRI) but
// instead samples (SCRS).
StringList comment;
for(ushort i = 0; i < sampleCount; ++ i)
{
@ -209,7 +219,7 @@ void S3M::File::read(bool)
READ_STRING_AS(sampleName, 28);
// The next 4 bytes should be "SCRS", but I've found
// otherwise ok files with 4 nils instead.
// files that are otherwise ok with 4 nils instead.
// READ_ASSERT(readBlock(4) == "SCRS");
comment.append(sampleName);