READ_U16L_AS(instrumentCount);
READ_U16L_AS(sampleCount);
- d->properties.setSampleLength(length);
+ d->properties.setTableLength(length);
d->properties.setInstrumentCount(instrumentCount);
d->properties.setSampleCount(sampleCount);
READ_U16L(d->properties.setPatternCount);
{
public:
PropertiesPrivate() :
- sampleLength(0),
+ tableLength(0),
stereo(false),
instrumentCount(0),
sampleCount(0),
{
}
- ushort sampleLength;
+ ushort tableLength;
bool stereo;
ushort instrumentCount;
ushort sampleCount;
return d->stereo ? 2 : 1;
}
-ushort IT::Properties::sampleLength() const
+ushort IT::Properties::tableLength() const
{
- return d->sampleLength;
+ return d->tableLength;
}
bool IT::Properties::stereo() const
return d->bpmSpeed;
}
-void IT::Properties::setSampleLength(ushort sampleLength)
+void IT::Properties::setTableLength(ushort tableLength)
{
- d->sampleLength = sampleLength;
+ d->tableLength = tableLength;
}
void IT::Properties::setStereo(bool stereo)
int sampleRate() const;
int channels() const;
- ushort sampleLength() const;
+ ushort tableLength() const;
bool stereo() const;
ushort instrumentCount() const;
ushort sampleCount() const;
uchar bpmSpeed() const;
protected:
- void setSampleLength(ushort sampleLength);
+ void setTableLength(ushort tableLength);
void setStereo(bool stereo);
void setInstrumentCount(ushort instrumentCount);
return false;
}
seek(0);
- // Even though the spec says the title is padded with space
- // common tracker padd with '\0', so why shouldn't I?
writeString(d->tag.title(), 20);
// TODO: write comment as instrument names
return true;
for(int i = 0; i < instruments; ++ i)
{
READ_STRING_AS(instrumentName, 22);
- READ_U16B_AS(instrumentLength);
+ // value in words, * 2 (<< 1) for bytes:
+ READ_U16B_AS(sampleLength);
READ_BYTE_AS(fineTuneByte);
int fineTune = fineTuneByte & 0xF;
READ_BYTE_AS(volume);
if(volume > 64) volume = 64;
+ // volume in decibels: 20 * log10(volume / 64)
+ // value in words, * 2 (<< 1) for bytes:
READ_U16B_AS(repeatStart);
- // (int)repatStart << 1;
+ // value in words, * 2 (<< 1) for bytes:
READ_U16B_AS(repatLength);
- // (int)repatLength << 1;
comment.append(instrumentName);
}
- READ_BYTE(d->properties.setPatternCount);
+ READ_BYTE(d->properties.setTableLength);
d->tag.setComment(comment.toString("\n"));
}
PropertiesPrivate() :
channels(0),
instrumentCount(0),
- patternCount(0)
+ tableLength(0)
{
}
int channels;
uint instrumentCount;
- uint patternCount;
+ uint tableLength;
};
Mod::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
return d->instrumentCount;
}
-uint Mod::Properties::patternCount() const
+uint Mod::Properties::tableLength() const
{
- return d->patternCount;
+ return d->tableLength;
}
void Mod::Properties::setChannels(int channels)
d->instrumentCount = instrumentCount;
}
-void Mod::Properties::setPatternCount(uint patternCount)
+void Mod::Properties::setTableLength(uint tableLength)
{
- d->patternCount = patternCount;
+ d->tableLength = tableLength;
}
int channels() const;
uint instrumentCount() const;
- uint patternCount() const;
+ uint tableLength() const;
protected:
void setChannels(int channels);
void setInstrumentCount(uint sampleCount);
- void setPatternCount(uint patternCount);
+ void setTableLength(uint tableLength);
private:
Properties(const Properties&);
READ_U16L_AS(length);
READ_U16L_AS(sampleCount);
- d->properties.setSampleLength(length);
+ d->properties.setTableLength(length);
d->properties.setSampleCount(sampleCount);
READ_U16L(d->properties.setPatternCount);
{
public:
PropertiesPrivate() :
- sampleLength(0),
+ tableLength(0),
channels(0),
stereo(0),
sampleCount(0),
ultraClick(0),
usePanningValues(false) {}
- ushort sampleLength;
+ ushort tableLength;
int channels;
bool stereo;
ushort sampleCount;
return d->channels;
}
-ushort S3M::Properties::sampleLength() const
+ushort S3M::Properties::tableLength() const
{
- return d->sampleLength;
+ return d->tableLength;
}
bool S3M::Properties::stereo() const
return d->usePanningValues;
}
-void S3M::Properties::setSampleLength(ushort sampleLength)
+void S3M::Properties::setTableLength(ushort tableLength)
{
- d->sampleLength = sampleLength;
+ d->tableLength = tableLength;
}
void S3M::Properties::setChannels(int channels)
int sampleRate() const;
int channels() const;
- ushort sampleLength() const;
+ ushort tableLength() const;
bool stereo() const;
ushort sampleCount() const;
ushort patternCount() const;
bool usePanningValues() const;
protected:
- void setSampleLength(ushort sampleLength);
+ void setTableLength(ushort tableLength);
void setChannels(int channels);
void setStereo (bool stereo);
READ_STRING(d->tag.setTrackerName, 20);
READ_U16L(d->properties.setVersion);
READ_U32L_AS(headerSize);
- READ_U16L(d->properties.setSampleLength);
+ READ_U16L(d->properties.setTableLength);
READ_U16L(d->properties.setRestartPosition);
READ_U16L(d->properties.setChannels);
READ_U16L_AS(patternCount);
{
public:
PropertiesPrivate() :
- sampleLength(0),
+ tableLength(0),
channels(0),
version(0),
restartPosition(0),
{
}
- ushort sampleLength;
+ ushort tableLength;
int channels;
ushort version;
ushort restartPosition;
return d->channels;
}
-ushort XM::Properties::sampleLength() const
+ushort XM::Properties::tableLength() const
{
- return d->sampleLength;
+ return d->tableLength;
}
ushort XM::Properties::version() const
return d->bpmSpeed;
}
-void XM::Properties::setSampleLength(int sampleLength)
+void XM::Properties::setTableLength(ushort tableLength)
{
- d->sampleLength = sampleLength;
+ d->tableLength = tableLength;
}
void XM::Properties::setChannels(int channels)
int sampleRate() const;
int channels() const;
- ushort sampleLength() const;
+ ushort tableLength() const;
ushort version() const;
ushort restartPosition() const;
ushort patternCount() const;
ushort bpmSpeed() const;
protected:
- void setSampleLength(int sampleLength);
+ void setTableLength(ushort tableLength);
void setChannels(int channels);
void setVersion(ushort version);
test_wav.cpp
test_wavpack.cpp
test_mod.cpp
+ test_xm.cpp
)
IF(WITH_MP4)
SET(test_runner_SRCS ${test_runner_SRCS}
+/***************************************************************************
+ copyright : (C) 2011 by Mathias Panzenböck
+ email : grosser.meister.morti@gmx.net
+ ***************************************************************************/
+
+/***************************************************************************
+ * This library is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU Lesser General Public License version *
+ * 2.1 as published by the Free Software Foundation. *
+ * *
+ * This library 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 *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this library; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
+ * MA 02110-1301 USA *
+ ***************************************************************************/
+
#include <cppunit/extensions/HelperMacros.h>
#include <string>
-#include <stdio.h>
-#include <string.h>
#include <modfile.h>
-#include <stdlib.h>
#include "utils.h"
using namespace std;
class TestMod : public CppUnit::TestFixture
{
- CPPUNIT_TEST_SUITE(TestMod);
- CPPUNIT_TEST(testRead);
- CPPUNIT_TEST(testChangeTitle);
- CPPUNIT_TEST_SUITE_END();
+ CPPUNIT_TEST_SUITE(TestMod);
+ CPPUNIT_TEST(testRead);
+ CPPUNIT_TEST(testChangeTitle);
+ CPPUNIT_TEST_SUITE_END();
public:
- void testRead()
- {
- testRead(TEST_FILE_PATH_C("test.mod"), "title of song");
- }
-
- void testChangeTitle()
- {
- ScopedFileCopy copy("test", ".mod");
- {
- Mod::File file(copy.fileName().c_str());
- CPPUNIT_ASSERT(file.tag() != 0);
- file.tag()->setTitle("changed title");
- CPPUNIT_ASSERT(file.save());
- }
- {
- testRead(copy.fileName().c_str(), "changed title");
- }
- {
- assertFileEqual(
- copy.fileName().c_str(),
- TEST_FILE_PATH_C("changed_title.mod"));
- }
- }
+ void testRead()
+ {
+ testRead(TEST_FILE_PATH_C("test.mod"), "title of song");
+ }
+
+ void testChangeTitle()
+ {
+ ScopedFileCopy copy("test", ".mod");
+ {
+ Mod::File file(copy.fileName().c_str());
+ CPPUNIT_ASSERT(file.tag() != 0);
+ file.tag()->setTitle("changed title");
+ CPPUNIT_ASSERT(file.save());
+ }
+ testRead(copy.fileName().c_str(), "changed title");
+ CPPUNIT_ASSERT(fileEqual(
+ copy.fileName(),
+ TEST_FILE_PATH_C("changed_title.mod")));
+ }
private:
- class Closer
- {
- public:
- Closer(FILE *stream) : m_stream(stream)
- {
- }
-
- ~Closer()
- {
- if (m_stream)
- {
- fclose(m_stream);
- }
- }
- private:
- FILE *m_stream;
- };
-
- void assertFileEqual(const char *file1, const char *file2)
- {
- char buf1[BUFSIZ];
- char buf2[BUFSIZ];
-
- FILE *stream1 = fopen(file1, "rb");
- FILE *stream2 = fopen(file2, "rb");
-
- Closer closer1(stream1);
- Closer closer2(stream2);
-
- CPPUNIT_ASSERT(stream1 != 0);
- CPPUNIT_ASSERT(stream2 != 0);
-
- for (;;)
- {
- size_t n1 = fread(buf1, 1, BUFSIZ, stream1);
- size_t n2 = fread(buf2, 1, BUFSIZ, stream2);
-
- CPPUNIT_ASSERT_EQUAL(n1, n2);
-
- if (n1 == 0) break;
-
- CPPUNIT_ASSERT(memcmp(buf1, buf2, n1) == 0);
- }
- }
-
- void testRead(FileName fileName, const String &title)
- {
- Mod::File file(fileName);
-
- CPPUNIT_ASSERT(file.isValid());
-
- Mod::Properties *p = file.audioProperties();
- Mod::Tag *t = file.tag();
-
- CPPUNIT_ASSERT(0 != p);
- CPPUNIT_ASSERT(0 != t);
-
- CPPUNIT_ASSERT_EQUAL(0, p->length());
- CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
- CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
- CPPUNIT_ASSERT_EQUAL(8, p->channels());
- CPPUNIT_ASSERT_EQUAL(31U, p->instrumentCount());
- CPPUNIT_ASSERT_EQUAL(1U, p->patternCount());
- CPPUNIT_ASSERT_EQUAL(title, t->title());
- CPPUNIT_ASSERT_EQUAL(String::null, t->artist());
- CPPUNIT_ASSERT_EQUAL(String::null, t->album());
- CPPUNIT_ASSERT_EQUAL(String(
- "Instrument names\n"
- "are abused as\n"
- "comments in\n"
- "module file formats.\n"
- "-+-+-+-+-+-+-+-+-+-+-+\n"
- "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
- ), t->comment());
- CPPUNIT_ASSERT_EQUAL(String::null, t->genre());
- CPPUNIT_ASSERT_EQUAL(0U, t->year());
- CPPUNIT_ASSERT_EQUAL(0U, t->track());
- CPPUNIT_ASSERT_EQUAL(String("StarTrekker"), t->trackerName());
- }
+ void testRead(FileName fileName, const String &title)
+ {
+ Mod::File file(fileName);
+
+ CPPUNIT_ASSERT(file.isValid());
+
+ Mod::Properties *p = file.audioProperties();
+ Mod::Tag *t = file.tag();
+
+ CPPUNIT_ASSERT(0 != p);
+ CPPUNIT_ASSERT(0 != t);
+
+ CPPUNIT_ASSERT_EQUAL(0, p->length());
+ CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
+ CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
+ CPPUNIT_ASSERT_EQUAL(8, p->channels());
+ CPPUNIT_ASSERT_EQUAL(31U, p->instrumentCount());
+ CPPUNIT_ASSERT_EQUAL(1U, p->tableLength());
+ CPPUNIT_ASSERT_EQUAL(title, t->title());
+ CPPUNIT_ASSERT_EQUAL(String::null, t->artist());
+ CPPUNIT_ASSERT_EQUAL(String::null, t->album());
+ CPPUNIT_ASSERT_EQUAL(String(
+ "Instrument names\n"
+ "are abused as\n"
+ "comments in\n"
+ "module file formats.\n"
+ "-+-+-+-+-+-+-+-+-+-+-+\n"
+ "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+ ), t->comment());
+ CPPUNIT_ASSERT_EQUAL(String::null, t->genre());
+ CPPUNIT_ASSERT_EQUAL(0U, t->year());
+ CPPUNIT_ASSERT_EQUAL(0U, t->track());
+ CPPUNIT_ASSERT_EQUAL(String("StarTrekker"), t->trackerName());
+ }
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestMod);
--- /dev/null
+/***************************************************************************
+ copyright : (C) 2011 by Mathias Panzenböck
+ email : grosser.meister.morti@gmx.net
+ ***************************************************************************/
+
+/***************************************************************************
+ * This library is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU Lesser General Public License version *
+ * 2.1 as published by the Free Software Foundation. *
+ * *
+ * This library 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 *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this library; if not, write to the Free Software *
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, *
+ * MA 02110-1301 USA *
+ ***************************************************************************/
+
+#include <cppunit/extensions/HelperMacros.h>
+#include <string>
+#include <xmfile.h>
+#include "utils.h"
+
+using namespace std;
+using namespace TagLib;
+
+class TestXM : public CppUnit::TestFixture
+{
+ CPPUNIT_TEST_SUITE(TestXM);
+ CPPUNIT_TEST(testRead);
+ CPPUNIT_TEST(testChangeTitle);
+ CPPUNIT_TEST_SUITE_END();
+
+public:
+ void testRead()
+ {
+ testRead(TEST_FILE_PATH_C("test.xm"), "title of song");
+ }
+
+ void testChangeTitle()
+ {
+ ScopedFileCopy copy("test", ".xm");
+ {
+ XM::File file(copy.fileName().c_str());
+ CPPUNIT_ASSERT(file.tag() != 0);
+ file.tag()->setTitle("changed title");
+ CPPUNIT_ASSERT(file.save());
+ }
+ testRead(copy.fileName().c_str(), "changed title");
+ CPPUNIT_ASSERT(fileEqual(
+ copy.fileName(),
+ TEST_FILE_PATH_C("changed_title.xm")));
+ }
+
+private:
+ void testRead(FileName fileName, const String &title)
+ {
+ XM::File file(fileName);
+
+ CPPUNIT_ASSERT(file.isValid());
+
+ XM::Properties *p = file.audioProperties();
+ Mod::Tag *t = file.tag();
+
+ CPPUNIT_ASSERT(0 != p);
+ CPPUNIT_ASSERT(0 != t);
+
+ CPPUNIT_ASSERT_EQUAL(0, p->length());
+ CPPUNIT_ASSERT_EQUAL(0, p->bitrate());
+ CPPUNIT_ASSERT_EQUAL(0, p->sampleRate());
+ CPPUNIT_ASSERT_EQUAL(8, p->channels());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->tableLength());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort)260, p->version());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 0, p->restartPosition());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->patternCount());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort)128, p->instrumentCount());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 1, p->flags());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort) 6, p->tempo());
+ CPPUNIT_ASSERT_EQUAL((TagLib::ushort)125, p->bpmSpeed());
+ CPPUNIT_ASSERT_EQUAL(title, t->title());
+ CPPUNIT_ASSERT_EQUAL(String::null, t->artist());
+ CPPUNIT_ASSERT_EQUAL(String::null, t->album());
+ CPPUNIT_ASSERT_EQUAL(String(
+ "Instrument names\n"
+ "are abused as\n"
+ "comments in\n"
+ "module file formats.\n"
+ "-+-+-+-+-+-+-+-+-+-+-+\n"
+ "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+ "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+ "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+ "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
+ "\n\n\n"
+ "Sample\n"
+ "names\n"
+ "are sometimes\n"
+ "also abused as\n"
+ "comments."
+ ), t->comment());
+ CPPUNIT_ASSERT_EQUAL(String::null, t->genre());
+ CPPUNIT_ASSERT_EQUAL(0U, t->year());
+ CPPUNIT_ASSERT_EQUAL(0U, t->track());
+ CPPUNIT_ASSERT_EQUAL(String("MilkyTracker "), t->trackerName());
+ }
+};
+
+CPPUNIT_TEST_SUITE_REGISTRATION(TestXM);
#include <sys/fcntl.h>
#endif
#include <stdio.h>
+#include <string.h>
#include <string>
+#include <fstream>
using namespace std;
remove(filename.c_str());
}
+inline bool fileEqual(const string &filename1, const string &filename2)
+{
+ char buf1[BUFSIZ];
+ char buf2[BUFSIZ];
+
+ ifstream stream1(filename1.c_str(), ios_base::in | ios_base::binary);
+ ifstream stream2(filename2.c_str(), ios_base::in | ios_base::binary);
+
+ if(!stream1 && !stream2) return true;
+ if(!stream1 || !stream2) return false;
+
+ for(;;)
+ {
+ stream1.read(buf1, BUFSIZ);
+ stream2.read(buf2, BUFSIZ);
+
+ streamsize n1 = stream1.gcount();
+ streamsize n2 = stream2.gcount();
+
+ if(n1 != n2) return false;
+
+ if(n1 == 0) break;
+
+ if(memcmp(buf1, buf2, n1) != 0) return false;
+ }
+
+ return stream1.good() == stream2.good();
+}
+
class ScopedFileCopy
{
public:
projects / taglib / commitdiff