From cd8c6ffd87e8c53724d608c4084305c67c371548 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 3 Feb 2019 12:58:56 +0100 Subject: Add metadata support to xml parser and dom model. RE-add unit-tests for version 1 instruments. --- src/DGDOM.h | 26 +++++++- src/dgxmlparser.cc | 83 ++++++++++++++++++++---- src/domloader.cc | 4 +- src/instrument.h | 8 +-- src/rangemap.h | 2 +- src/sample.h | 2 - test/dgxmlparsertest.cc | 154 +++++++++++++++++++++++++++++++++++++++++++-- test/domloadertest.cc | 163 +++++++++++++++++++++++------------------------- 8 files changed, 328 insertions(+), 114 deletions(-) diff --git a/src/DGDOM.h b/src/DGDOM.h index 933c250..dea4228 100644 --- a/src/DGDOM.h +++ b/src/DGDOM.h @@ -103,13 +103,35 @@ struct InstrumentRefDOM std::vector channel_map; }; -struct DrumkitDOM +struct ClickMapDOM +{ + std::string instrument; + std::string colour; +}; + +struct MetadataDOM { - std::string name; std::string version; + std::string title; std::string description; + std::string license; + std::string notes; + std::string author; + std::string email; + std::string website; + std::string logo; + std::string image; + std::string image_map; + std::vector clickmaps; +}; + +struct DrumkitDOM +{ + std::string version; double samplerate; + MetadataDOM metadata; + std::vector instruments; std::vector channels; }; diff --git a/src/dgxmlparser.cc b/src/dgxmlparser.cc index fc5dbb9..28e183a 100644 --- a/src/dgxmlparser.cc +++ b/src/dgxmlparser.cc @@ -80,7 +80,8 @@ template static bool attrcpy(T& dest, const pugi::xml_node& src, const std::string& attr, bool opt = false) { const char* val = src.attribute(attr.c_str()).as_string(nullptr); - if(!val) { + if(!val) + { if(!opt) { ERR(dgxmlparser, "Attribute %s not found in %s, offset %d\n", @@ -89,7 +90,8 @@ static bool attrcpy(T& dest, const pugi::xml_node& src, const std::string& attr, return opt; } - if(!assign(dest, std::string(val))) { + if(!assign(dest, std::string(val))) + { ERR(dgxmlparser, "Attribute %s could not be assigned, offset %d\n", attr.data(), (int)src.offset_debug()); return false; @@ -98,6 +100,30 @@ static bool attrcpy(T& dest, const pugi::xml_node& src, const std::string& attr, return true; } +template +static bool nodecpy(T& dest, const pugi::xml_node& src, const std::string& node, bool opt = false) +{ + auto val = src.child(node.c_str()); + if(val == pugi::xml_node()) + { + if(!opt) + { + ERR(dgxmlparser, "Node %s not found in %s, offset %d\n", + node.data(), src.path().data(), (int)src.offset_debug()); + } + return opt; + } + + if(!assign(dest, val.text().as_string())) + { + ERR(dgxmlparser, "Attribute %s could not be assigned, offset %d\n", + node.data(), (int)src.offset_debug()); + return false; + } + + return true; +} + bool parseDrumkitFile(const std::string& filename, DrumkitDOM& dom) { bool res = true; @@ -112,16 +138,50 @@ bool parseDrumkitFile(const std::string& filename, DrumkitDOM& dom) return false; } - //TODO: handle xml version - pugi::xml_node drumkit = doc.child("drumkit"); - res &= attrcpy(dom.name, drumkit, "name"); + dom.version = "1.0"; res &= attrcpy(dom.version, drumkit, "version", true); - res &= attrcpy(dom.description, drumkit, "description"); dom.samplerate = 44100.0; res &= attrcpy(dom.samplerate, drumkit, "samplerate", true); + // Use the old name and description attributes on the drumkit node as fallback + res &= attrcpy(dom.metadata.title, drumkit, "name", true); + res &= attrcpy(dom.metadata.description, drumkit, "description", true); + + pugi::xml_node metadata = drumkit.child("metadata"); + if(metadata != pugi::xml_node()) + { + auto& meta = dom.metadata; + res &= nodecpy(meta.version, metadata, "version", true); + res &= nodecpy(meta.title, metadata, "title", true); + pugi::xml_node logo = metadata.child("logo"); + if(logo != pugi::xml_node()) + { + res &= attrcpy(meta.logo, logo, "src", true); + } + res &= nodecpy(meta.description, metadata, "description", true); + res &= nodecpy(meta.license, metadata, "license", true); + res &= nodecpy(meta.notes, metadata, "notes", true); + res &= nodecpy(meta.author, metadata, "author", true); + res &= nodecpy(meta.email, metadata, "email", true); + res &= nodecpy(meta.website, metadata, "website", true); + pugi::xml_node image = metadata.child("image"); + if(image != pugi::xml_node()) + { + res &= attrcpy(meta.image, image, "src", true); + res &= attrcpy(meta.image_map, image, "map", true); + for(auto clickmap : image.children("clickmap")) + { + meta.clickmaps.emplace_back(); + res &= attrcpy(meta.clickmaps.back().instrument, + clickmap, "instrument", true); + res &= attrcpy(meta.clickmaps.back().colour, + clickmap, "colour", true); + } + } + } + pugi::xml_node channels = doc.child("drumkit").child("channels"); for(pugi::xml_node channel: channels.children("channel")) { @@ -212,7 +272,7 @@ bool parseInstrumentFile(const std::string& filename, InstrumentDOM& dom) } // Velocity groups are only part of v1.0 instruments. - if(dom.version == "1.0") + if(dom.version == "1" || dom.version == "1.0" || dom.version == "1.0.0") { pugi::xml_node velocities = instrument.child("velocities"); for(pugi::xml_node velocity: velocities.children("velocity")) @@ -221,13 +281,12 @@ bool parseInstrumentFile(const std::string& filename, InstrumentDOM& dom) res &= attrcpy(dom.velocities.back().lower, velocity, "lower"); res &= attrcpy(dom.velocities.back().upper, velocity, "upper"); - for(pugi::xml_node sampleref: velocity.children("sampleref")) + for(auto sampleref : velocity.children("sampleref")) { dom.velocities.back().samplerefs.emplace_back(); - res &= attrcpy(dom.velocities.back().samplerefs.back().probability, - sampleref, "probability"); - res &= attrcpy(dom.velocities.back().samplerefs.back().name, - sampleref, "name"); + auto& sref = dom.velocities.back().samplerefs.back(); + res &= attrcpy(sref.probability, sampleref, "probability"); + res &= attrcpy(sref.name, sampleref, "name"); } } } diff --git a/src/domloader.cc b/src/domloader.cc index 8a133fa..ad97165 100644 --- a/src/domloader.cc +++ b/src/domloader.cc @@ -56,9 +56,9 @@ bool DOMLoader::loadDom(const std::string& basepath, { settings.has_bleed_control.store(false); - drumkit._name = dom.name; + drumkit._name = dom.metadata.title; drumkit._version = dom.version; - drumkit._description = dom.description; + drumkit._description = dom.metadata.description; drumkit._samplerate = dom.samplerate; for(const auto& channel: dom.channels) diff --git a/src/instrument.h b/src/instrument.h index 6e59681..125d7ab 100644 --- a/src/instrument.h +++ b/src/instrument.h @@ -67,15 +67,11 @@ public: float getMinPower() const; private: - friend class DOMLoader; + // For unit-tests: friend class DOMLoaderTest; // For parser: - friend class InstrumentParser; - friend class DrumKitParser; - - // For unit-tests: - friend class InstrumentParserTest; + friend class DOMLoader; void* magic; diff --git a/src/rangemap.h b/src/rangemap.h index e53cbe8..6448e0e 100644 --- a/src/rangemap.h +++ b/src/rangemap.h @@ -37,7 +37,7 @@ public: std::vector get(T1 at); private: - friend class InstrumentParserTest; + friend class DOMLoaderTest; std::multimap, T2> values; }; diff --git a/src/sample.h b/src/sample.h index 48f94ac..223648f 100644 --- a/src/sample.h +++ b/src/sample.h @@ -47,9 +47,7 @@ public: private: friend class DOMLoader; friend class DOMLoaderTest; - friend class InstrumentParser; friend class PowerList; - friend class InstrumentParserTest; void addAudioFile(InstrumentChannel* instrument_channel, AudioFile* audio_file); diff --git a/test/dgxmlparsertest.cc b/test/dgxmlparsertest.cc index 30bcfa7..a1f7bd3 100644 --- a/test/dgxmlparsertest.cc +++ b/test/dgxmlparsertest.cc @@ -35,11 +35,121 @@ class DGXmlParserTest public: DGXmlParserTest() { - DGUNIT_TEST(DGXmlParserTest::instrumentParserTest); + DGUNIT_TEST(DGXmlParserTest::instrumentParserTest_v1); + DGUNIT_TEST(DGXmlParserTest::instrumentParserTest_v2); DGUNIT_TEST(DGXmlParserTest::drumkitParserTest); } - void instrumentParserTest() + void instrumentParserTest_v1() + { + ScopedFile scoped_file( + "\n" \ + "\n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " " \ + " " \ + " " \ + " " \ + " " \ + " " \ + ""); + + InstrumentDOM dom; + DGUNIT_ASSERT(probeInstrumentFile(scoped_file.filename())); + DGUNIT_ASSERT(parseInstrumentFile(scoped_file.filename(), dom)); + + DGUNIT_ASSERT_EQUAL(std::string("Snare"), dom.name); + DGUNIT_ASSERT_EQUAL(std::string("1.0"), dom.version); + DGUNIT_ASSERT_EQUAL(std::string("A nice snare"), dom.description); + DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.samples.size()); + + { + const auto& s = dom.samples[0]; + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), s.name); + DGUNIT_ASSERT_EQUAL(std::size_t(4), s.audiofiles.size()); + + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), s.audiofiles[0].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare-1.wav"), s.audiofiles[0].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[0].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), s.audiofiles[1].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare-2.wav"), s.audiofiles[1].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[1].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), s.audiofiles[2].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare-3.wav"), s.audiofiles[2].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[2].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), s.audiofiles[3].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("1-Snare-4.wav"), s.audiofiles[3].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[3].filechannel); + } + + { + const auto& s = dom.samples[1]; + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), s.name); + DGUNIT_ASSERT_EQUAL(std::size_t(4), s.audiofiles.size()); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), s.audiofiles[0].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare-1.wav"), s.audiofiles[0].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[0].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), s.audiofiles[1].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare-2.wav"), s.audiofiles[1].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[1].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), s.audiofiles[2].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare-3.wav"), s.audiofiles[2].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[2].filechannel); + + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), s.audiofiles[3].instrument_channel); + DGUNIT_ASSERT_EQUAL(std::string("2-Snare-4.wav"), s.audiofiles[3].file); + DGUNIT_ASSERT_EQUAL(std::size_t(1), s.audiofiles[3].filechannel); + } + + DGUNIT_ASSERT_EQUAL(std::size_t(0), dom.instrument_channels.size()); + + DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.velocities.size()); + { + const auto& velocity = dom.velocities[0]; + DGUNIT_ASSERT_EQUAL(0.0, velocity.lower); + DGUNIT_ASSERT_EQUAL(0.6, velocity.upper); + DGUNIT_ASSERT_EQUAL(std::size_t(2), velocity.samplerefs.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), velocity.samplerefs[0].name); + DGUNIT_ASSERT_EQUAL(0.6, velocity.samplerefs[0].probability); + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), velocity.samplerefs[1].name); + DGUNIT_ASSERT_EQUAL(0.4, velocity.samplerefs[1].probability); + } + + { + const auto& velocity = dom.velocities[1]; + DGUNIT_ASSERT_EQUAL(0.6, velocity.lower); + DGUNIT_ASSERT_EQUAL(1.0, velocity.upper); + DGUNIT_ASSERT_EQUAL(std::size_t(2), velocity.samplerefs.size()); + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), velocity.samplerefs[0].name); + DGUNIT_ASSERT_EQUAL(0.4, velocity.samplerefs[0].probability); + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), velocity.samplerefs[1].name); + DGUNIT_ASSERT_EQUAL(0.6, velocity.samplerefs[1].probability); + } +} + + void instrumentParserTest_v2() { ScopedFile scoped_file( "\n" \ @@ -126,13 +236,30 @@ public: DGUNIT_ASSERT(main_state_t::is_not_main == dom.instrument_channels[1].main); DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), dom.instrument_channels[2].name); DGUNIT_ASSERT(main_state_t::unset == dom.instrument_channels[2].main); + + DGUNIT_ASSERT_EQUAL(std::size_t(0), dom.velocities.size()); } void drumkitParserTest() { ScopedFile scoped_file( "\n" \ - "\n" \ + "\n" \ + " \n" \ + " 1.2.3\n" \ + " Test Kit\n" \ + " \n" \ + " This is the description of the drumkit\n" \ + " Creative Commons\n" \ + " These are general notes\n" \ + " Author of the drumkit\n" \ + " author@email.org\n" \ + " http://www.drumgizmo.org\n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ + " \n" \ " \n" \ " \n" \ " \n" \ @@ -159,10 +286,27 @@ public: DGUNIT_ASSERT(probeDrumkitFile(scoped_file.filename())); DGUNIT_ASSERT(parseDrumkitFile(scoped_file.filename(), dom)); - DGUNIT_ASSERT_EQUAL(std::string("CrocellKit"), dom.name); DGUNIT_ASSERT_EQUAL(std::string("2.0"), dom.version); - DGUNIT_ASSERT_EQUAL(std::string("my description"), dom.description); DGUNIT_ASSERT_EQUAL(48000.0, dom.samplerate); + + DGUNIT_ASSERT_EQUAL(std::string("1.2.3"), dom.metadata.version); + DGUNIT_ASSERT_EQUAL(std::string("Test Kit"), dom.metadata.title); + DGUNIT_ASSERT_EQUAL(std::string("LogoFile.png"), dom.metadata.logo); + DGUNIT_ASSERT_EQUAL(std::string("This is the description of the drumkit"), dom.metadata.description); + DGUNIT_ASSERT_EQUAL(std::string("Creative Commons"), dom.metadata.license); + DGUNIT_ASSERT_EQUAL(std::string("These are general notes"), dom.metadata.notes); + DGUNIT_ASSERT_EQUAL(std::string("Author of the drumkit"), dom.metadata.author); + DGUNIT_ASSERT_EQUAL(std::string("author@email.org"), dom.metadata.email); + DGUNIT_ASSERT_EQUAL(std::string("http://www.drumgizmo.org"), dom.metadata.website); + DGUNIT_ASSERT_EQUAL(std::string("DrumkitImage.png"), dom.metadata.image); + DGUNIT_ASSERT_EQUAL(std::string("DrumkitImageClickMap.png"), dom.metadata.image_map); + + DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.metadata.clickmaps.size()); + DGUNIT_ASSERT_EQUAL(std::string("ff08a2"), dom.metadata.clickmaps[0].colour); + DGUNIT_ASSERT_EQUAL(std::string("China"), dom.metadata.clickmaps[0].instrument); + DGUNIT_ASSERT_EQUAL(std::string("a218d7"), dom.metadata.clickmaps[1].colour); + DGUNIT_ASSERT_EQUAL(std::string("HihatClosed"), dom.metadata.clickmaps[1].instrument); + DGUNIT_ASSERT_EQUAL(std::size_t(2), dom.instruments.size()); { const auto& instr = dom.instruments[0]; diff --git a/test/domloadertest.cc b/test/domloadertest.cc index 55d49a7..2cd6aa8 100644 --- a/test/domloadertest.cc +++ b/test/domloadertest.cc @@ -70,29 +70,40 @@ public: " \n" \ ""); + // Version 1.0 format ScopedFile scoped_instrument_file2( "\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" \ + " " \ + " " \ + " " \ + " " \ + " " \ + " " \ ""); ScopedFile scoped_file( std::string( "\n" \ - "\n" \ + "\n" \ " \n" \ " \n" \ " \n" \ @@ -142,8 +153,6 @@ public: DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), drumkit.channels[2].name); DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), drumkit.channels[3].name); - DGUNIT_ASSERT_EQUAL(std::string("CrocellKit"), drumkit._name); - DGUNIT_ASSERT_EQUAL(std::string("my description"), drumkit._description); DGUNIT_ASSERT_EQUAL(std::size_t(48000), drumkit._samplerate); DGUNIT_ASSERT(VersionStr("2.0.0") == drumkit._version); @@ -231,86 +240,72 @@ public: } // - // Instrument2 'Snare2': + // Instrument2 'Snare2' (version 1.0 instrument): // { - auto& instrument = *drumkit.instruments[1]; - DGUNIT_ASSERT_EQUAL(std::string(""), instrument._group); - DGUNIT_ASSERT_EQUAL(std::string("Snare2"), instrument._name); - DGUNIT_ASSERT_EQUAL(std::string(""), instrument._description); + auto& instrument = *drumkit.instruments[1]; + DGUNIT_ASSERT_EQUAL(std::string(""), instrument._group); + DGUNIT_ASSERT_EQUAL(std::string("Snare2"), instrument._name); + DGUNIT_ASSERT_EQUAL(std::string(""), instrument._description); - DGUNIT_ASSERT(VersionStr("2.0.0") == instrument.version); + DGUNIT_ASSERT(VersionStr("1.0.0") == instrument.version); - // NOTE: instrument.samples are the sample map belonging to version 1.0 - DGUNIT_ASSERT_EQUAL(std::size_t(2), instrument.samplelist.size()); - { - const auto& sample = *instrument.samplelist[0]; - DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), sample.name); - DGUNIT_ASSERT_EQUAL(0.00985718f, sample.power); - DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); - for(const auto& audiofile : sample.audiofiles) + // NOTE: instrument.samples are the sample map belonging to version 1.0 + DGUNIT_ASSERT_EQUAL(std::size_t(2), instrument.samplelist.size()); { - DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare.wav"), audiofile.second->filename); - switch(audiofile.second->filechannel) - { - // NOTE: Channel numbers are zero based - they are 1 based in the xml - case 0: - DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), - audiofile.second->instrument_channel->name); - break; - case 1: - DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), - audiofile.second->instrument_channel->name); - break; - case 11: - DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), - audiofile.second->instrument_channel->name); - break; - case 12: - DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), - audiofile.second->instrument_channel->name); - break; - default: - DGUNIT_ASSERT(false); - break; - } + const auto& sample = *instrument.samplelist[0]; + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), sample.name); + DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); + auto afile = sample.audiofiles.begin(); + DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare-1.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), afile->second->instrument_channel->name); + ++afile; + DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare-2.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), afile->second->instrument_channel->name); + ++afile; + DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare-3.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), afile->second->instrument_channel->name); + ++afile; + DGUNIT_ASSERT_EQUAL(std::string("/tmp/1-Snare-4.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), afile->second->instrument_channel->name); } - } - { - const auto& sample = *instrument.samplelist[1]; - DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), sample.name); - DGUNIT_ASSERT_EQUAL(0.0124808f, sample.power); - DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); - for(const auto& audiofile : sample.audiofiles) { - DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare.wav"), audiofile.second->filename); - switch(audiofile.second->filechannel) - { - // NOTE: Channel numbers are zero based - they are 1 based in the xml - case 0: - DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), - audiofile.second->instrument_channel->name); - break; - case 1: - DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), - audiofile.second->instrument_channel->name); - break; - case 11: - DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), - audiofile.second->instrument_channel->name); - break; - case 12: - DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), - audiofile.second->instrument_channel->name); - break; - default: - DGUNIT_ASSERT(false); - break; - } + const auto& sample = *instrument.samplelist[1]; + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), sample.name); + DGUNIT_ASSERT_EQUAL(std::size_t(4), sample.audiofiles.size()); + auto afile = sample.audiofiles.begin(); + DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare-1.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), afile->second->instrument_channel->name); + ++afile; + DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare-2.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), afile->second->instrument_channel->name); + ++afile; + DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare-3.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("SnareBottom"), afile->second->instrument_channel->name); + ++afile; + DGUNIT_ASSERT_EQUAL(std::string("/tmp/2-Snare-4.wav"), afile->second->filename); + DGUNIT_ASSERT_EQUAL(std::string("SnareTop"), afile->second->instrument_channel->name); } - } + + DGUNIT_ASSERT_EQUAL(std::size_t(4), instrument.samples.values.size()); + auto value = instrument.samples.values.begin(); + DGUNIT_ASSERT_EQUAL(0.0, value->first.first); // lower + DGUNIT_ASSERT_EQUAL(0.6, value->first.second); // upper + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), value->second->name); + ++value; + DGUNIT_ASSERT_EQUAL(0.0, value->first.first); // lower + DGUNIT_ASSERT_EQUAL(0.6, value->first.second); // upper + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), value->second->name); + ++value; + DGUNIT_ASSERT_EQUAL(0.6, value->first.first); // lower + DGUNIT_ASSERT_EQUAL(1.0, value->first.second); // upper + DGUNIT_ASSERT_EQUAL(std::string("Snare-2"), value->second->name); + ++value; + DGUNIT_ASSERT_EQUAL(0.6, value->first.first); // lower + DGUNIT_ASSERT_EQUAL(1.0, value->first.second); // upper + DGUNIT_ASSERT_EQUAL(std::string("Snare-1"), value->second->name); } } }; -- cgit v1.2.3