summaryrefslogtreecommitdiff
path: root/src/instrumentparser.cc
diff options
context:
space:
mode:
authorAndré Nusser <andre.nusser@googlemail.com>2016-03-22 00:40:15 +0100
committerAndré Nusser <andre.nusser@googlemail.com>2016-03-22 17:16:03 +0100
commit0728a11284f15100a8f8e0d9da0192019a056d6a (patch)
treedd430619bc74314ae21941102f1f1f92769d9ddc /src/instrumentparser.cc
parent8e2124ad955b51efb2f539998a369d7ca07cbc73 (diff)
Parser refactoring.
* Use new style * Update to C++11 * Use more std::string than char*
Diffstat (limited to 'src/instrumentparser.cc')
-rw-r--r--src/instrumentparser.cc399
1 files changed, 189 insertions, 210 deletions
diff --git a/src/instrumentparser.cc b/src/instrumentparser.cc
index 5d6acef..c04aee3 100644
--- a/src/instrumentparser.cc
+++ b/src/instrumentparser.cc
@@ -35,228 +35,207 @@
#include "nolocale.h"
-InstrumentParser::InstrumentParser(const std::string &file, Instrument &i)
- : instrument(i)
+InstrumentParser::InstrumentParser(const std::string& file, Instrument& i)
+ : instrument(i)
{
- s = NULL;
- // DEBUG(instrparser,"Parsing instrument in %s\n", file.c_str());
- path = getPath(file);
- fd = fopen(file.c_str(), "r");
- if(!fd) return;
+ // DEBUG(instrparser,"Parsing instrument in %s\n", file.c_str());
+ path = getPath(file);
+ fd = fopen(file.c_str(), "r");
+
+ if(!fd)
+ {
+ ERR(instrparser, "The following instrument file could not be opened: %s\n", file.c_str());
+ return;
+ }
}
InstrumentParser::~InstrumentParser()
{
- if(fd) fclose(fd);
+ if(fd)
+ {
+ fclose(fd);
+ }
}
-void InstrumentParser::startTag(std::string name,
- std::map<std::string, std::string> attr)
+void InstrumentParser::startTag(const std::string& name, attr_t& attr)
{
- if(name == "instrument") {
- if(attr.find("name") != attr.end())
- instrument._name = attr["name"];
-
- if(attr.find("description") != attr.end())
- instrument._description = attr["description"];
-
- if(attr.find("version") != attr.end()) {
- try {
- instrument.version = VersionStr(attr["version"]);
- } catch(const char *err) {
- ERR(instrparser, "Error parsing version number: %s, using 1.0\n", err);
- instrument.version = VersionStr(1,0,0);
- }
- } else {
- WARN(instrparser, "Missing version number, assuming 1.0\n");
- instrument.version = VersionStr(1,0,0);
- }
- }
-
- if(name == "samples") {
- }
-
- if(name == "sample") {
- if(attr.find("name") == attr.end()) {
- DEBUG(instrparser,"Missing required attribute 'name'.\n");
- return;
- }
-
- float power;
- if(attr.find("power") == attr.end()) {
- power = -1;
- } else {
- power = atof_nol(attr["power"].c_str());
- DEBUG(instrparser, "Instrument power set to %f\n", power);
- }
-
- // TODO get rid of new or delete it properly
- s = new Sample(attr["name"], power);
- }
-
- if(name == "audiofile") {
- if(s == NULL) {
- DEBUG(instrparser,"Missing Sample!\n");
- return;
- }
-
- if(attr.find("file") == attr.end()) {
- DEBUG(instrparser,"Missing required attribute 'file'.\n");
- return;
- }
-
- if(attr.find("channel") == attr.end()) {
- DEBUG(instrparser,"Missing required attribute 'channel'.\n");
- return;
- }
- int filechannel = 1; // default, override with optional attribute
- if(attr.find("filechannel") != attr.end()) {
- filechannel = atoi(attr["filechannel"].c_str());
- if(filechannel < 1) {
- DEBUG(instrparser,"Invalid value for attribute 'filechannel'.\n");
- filechannel = 1;
- }
- }
- filechannel = filechannel - 1; // 1-based in file, but zero-based internally
- // TODO do those next two lines correspond with proper deletes? If not fix it.
- AudioFile *af = new AudioFile(path + "/" + attr["file"], filechannel);
- InstrumentChannel *ch = new InstrumentChannel(attr["channel"]);
- channellist.push_back(ch);
- s->addAudioFile(ch, af);
- instrument.audiofiles.push_back(af);
- }
-
- if(name == "velocities") {
- }
-
- if(name == "velocity") {
- if(attr.find("lower") == attr.end()) {
- DEBUG(instrparser,"Missing required attribute 'lower'.\n");
- return;
- }
-
- if(attr.find("upper") == attr.end()) {
- DEBUG(instrparser,"Missing required attribute 'upper'.\n");
- return;
- }
-
- lower = atof_nol(attr["lower"].c_str());
- upper = atof_nol(attr["upper"].c_str());
- }
-
- if(name == "sampleref") {
- if(attr.find("name") == attr.end()) {
- DEBUG(instrparser,"Missing required attribute 'name'.\n");
- return;
- }
-
- Sample *sample = NULL;
- std::vector<Sample *>::iterator i = instrument.samplelist.begin();
- while(i != instrument.samplelist.end()) {
- if((*i)->name == attr["name"]) {
- sample = *i;
- break;
- }
- i++;
- }
-
- if(sample == NULL) {
- DEBUG(instrparser,"Samplref pointed at non-existing sample.\n");
- return;
- }
-
- if(instrument.version == VersionStr("1.0")) {
- // Old "velocity group" algorithm needs this
- instrument.addSample(lower, upper, sample);
- }
- }
+ if(name == "instrument")
+ {
+ if(attr.find("name") != attr.end())
+ {
+ instrument._name = attr["name"];
+ }
+
+ if(attr.find("description") != attr.end())
+ {
+ instrument._description = attr["description"];
+ }
+
+ if(attr.find("version") != attr.end())
+ {
+ try {
+ instrument.version = VersionStr(attr["version"]);
+ }
+ catch(const char *err)
+ {
+ ERR(instrparser, "Error parsing version number: %s, using 1.0\n", err);
+ instrument.version = VersionStr(1,0,0);
+ }
+ }
+ else
+ {
+ WARN(instrparser, "Missing version number, assuming 1.0\n");
+ instrument.version = VersionStr(1,0,0);
+ }
+ }
+
+ if(name == "samples")
+ {
+
+ }
+
+ if(name == "sample")
+ {
+ if(attr.find("name") == attr.end())
+ {
+ ERR(instrparser,"Missing required attribute 'name'.\n");
+ return;
+ }
+
+ float power;
+ if(attr.find("power") == attr.end())
+ {
+ power = -1;
+ }
+ else
+ {
+ power = atof_nol(attr["power"].c_str());
+ DEBUG(instrparser, "Instrument power set to %f\n", power);
+ }
+
+ // TODO get rid of new or delete it properly
+ s = new Sample(attr["name"], power);
+ }
+
+ if(name == "audiofile")
+ {
+ if(s == nullptr)
+ {
+ ERR(instrparser,"Missing Sample!\n");
+ return;
+ }
+
+ if(attr.find("file") == attr.end())
+ {
+ ERR(instrparser,"Missing required attribute 'file'.\n");
+ return;
+ }
+
+ if(attr.find("channel") == attr.end())
+ {
+ ERR(instrparser,"Missing required attribute 'channel'.\n");
+ return;
+ }
+
+ int filechannel = 1; // default, override with optional attribute
+ if(attr.find("filechannel") != attr.end())
+ {
+ filechannel = std::stoi(attr["filechannel"]);
+ if(filechannel < 1)
+ {
+ ERR(instrparser,"Invalid value for attribute 'filechannel'.\n");
+ filechannel = 1;
+ }
+ }
+
+ filechannel = filechannel - 1; // 1-based in file, but zero-based internally
+ // TODO do those next two lines correspond with proper deletes? If not fix it.
+ AudioFile *af = new AudioFile(path + "/" + attr["file"], filechannel);
+ InstrumentChannel *ch = new InstrumentChannel(attr["channel"]);
+ channellist.push_back(ch);
+ s->addAudioFile(ch, af);
+ instrument.audiofiles.push_back(af);
+ }
+
+ if(name == "velocities")
+ {
+
+ }
+
+ if(name == "velocity")
+ {
+ if(attr.find("lower") == attr.end())
+ {
+ ERR(instrparser,"Missing required attribute 'lower'.\n");
+ return;
+ }
+
+ if(attr.find("upper") == attr.end())
+ {
+ ERR(instrparser,"Missing required attribute 'upper'.\n");
+ return;
+ }
+
+ lower = atof_nol(attr["lower"].c_str());
+ upper = atof_nol(attr["upper"].c_str());
+ }
+
+ if(name == "sampleref")
+ {
+ if(attr.find("name") == attr.end())
+ {
+ ERR(instrparser,"Missing required attribute 'name'.\n");
+ return;
+ }
+
+ Sample* sample = nullptr;
+ std::vector<Sample *>::iterator i = instrument.samplelist.begin();
+ while(i != instrument.samplelist.end())
+ {
+ if((*i)->name == attr["name"])
+ {
+ sample = *i;
+ break;
+ }
+ i++;
+ }
+
+ if(sample == nullptr)
+ {
+ ERR(instrparser,"Samplref pointed at non-existing sample.\n");
+ return;
+ }
+
+ if(instrument.version == VersionStr("1.0"))
+ {
+ // Old "velocity group" algorithm needs this
+ instrument.addSample(lower, upper, sample);
+ }
+ }
}
-void InstrumentParser::endTag(std::string name)
+void InstrumentParser::endTag(const std::string& name)
{
- if(name == "sample") {
- if(s == NULL) {
- DEBUG(instrparser,"Missing Sample.\n");
- return;
- }
-
- instrument.samplelist.push_back(s);
-
- s = NULL;
- }
-
- if(name == "instrument") {
- instrument.finalise();
- }
+ if(name == "sample")
+ {
+ if(s == nullptr)
+ {
+ ERR(instrparser,"Missing Sample.\n");
+ return;
+ }
+
+ instrument.samplelist.push_back(s);
+
+ s = nullptr;
+ }
+
+ if(name == "instrument") {
+ instrument.finalise();
+ }
}
-int InstrumentParser::readData(char *data, size_t size)
+int InstrumentParser::readData(std::string& data, std::size_t size)
{
- if(!fd) return -1;
- return fread(data, 1, size, fd);
+ if(!fd) return -1;
+ return fread((char*)data.c_str(), 1, size, fd);
}
-
-
-#ifdef TEST_INSTRUMENTPARSER
-//deps: saxparser.cc instrument.cc sample.cc audiofile.cc channel.cc
-//cflags: $(EXPAT_CFLAGS) $(SNDFILE_CFLAGS)
-//libs: $(EXPAT_LIBS) $(SNDFILE_LIBS)
-#include "test.h"
-
-const char xml[] =
-"<?xml version='1.0' encoding='UTF-8'?>\n"
-"<instrument name=\"kick-r\">\n"
-" <samples>\n"
-" <sample name=\"kick-r-1\">\n"
-" <audiofile channel=\"Alesis\" file=\"samples/1-kick-r-Alesis-3.wav\"/>\n"
-" <audiofile channel=\"Amb L\" file=\"samples/1-kick-r-Amb L-3.wav\"/>\n"
-" <audiofile channel=\"Amb R\" file=\"samples/1-kick-r-Amb R-3.wav\"/>\n"
-" <audiofile channel=\"Kick L\" file=\"samples/1-kick-r-Kick L-3.wav\"/>\n"
-" <audiofile channel=\"Kick R\" file=\"samples/1-kick-r-Kick R-3.wav\"/>\n"
-" </sample>\n"
-" <sample name=\"kick-r-2\">\n"
-" <audiofile channel=\"Alesis\" file=\"samples/2-kick-r-Alesis-3.wav\"/>\n"
-" <audiofile channel=\"Amb L\" file=\"samples/2-kick-r-Amb L-3.wav\"/>\n"
-" <audiofile channel=\"Amb R\" file=\"samples/2-kick-r-Amb R-3.wav\"/>\n"
-" <audiofile channel=\"Kick L\" file=\"samples/2-kick-r-Kick L-3.wav\"/>\n"
-" <audiofile channel=\"Kick R\" file=\"samples/2-kick-r-Kick R-3.wav\"/>\n"
-" </sample>\n"
-" <sample name=\"kick-r-3\">\n"
-" <audiofile channel=\"Alesis\" file=\"samples/3-kick-r-Alesis-3.wav\"/>\n"
-" <audiofile channel=\"Amb L\" file=\"samples/3-kick-r-Amb L-3.wav\"/>\n"
-" <audiofile channel=\"Amb R\" file=\"samples/3-kick-r-Amb R-3.wav\"/>\n"
-" <audiofile channel=\"Kick L\" file=\"samples/3-kick-r-Kick L-3.wav\"/>\n"
-" <audiofile channel=\"Kick R\" file=\"samples/3-kick-r-Kick R-3.wav\"/>\n"
-" </sample>\n"
-" </samples>\n"
-" <velocities>\n"
-" <velocity lower=\"0\" upper=\"0.7\">\n"
-" <sampleref name=\"kick-r-1\"/>\n"
-" <sampleref name=\"kick-r-2\"/>\n"
-" </velocity>\n"
-" <velocity lower=\"0.7\" upper=\"1.0\">\n"
-" <sampleref name=\"kick-r-3\"/>\n"
-" </velocity>\n"
-" </velocities>\n"
-"</instrument>\n"
- ;
-
-#define FNAME "/tmp/instrtest.xml"
-
-TEST_BEGIN;
-
-FILE *fp = fopen(FNAME, "w");
-fprintf(fp, "%s", xml);
-fclose(fp);
-
-Instrument instr;
-InstrumentParser p(FNAME, instr);
-TEST_EQUAL_INT(p.parse(), 0, "Parsing went well?");
-
-TEST_EQUAL_STR(instr.name(), "kick-r", "Compare name");
-
-unlink(FNAME);
-
-TEST_END;
-
-#endif/*TEST_INSTRUMENTPARSER*/