Remove the old instrument and drumkit parser code as well as version 1.0 kit handling (velocity range maps).

3 files changed, 1 insertions, 313 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index 1e3980a..32f158d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,7 +7,7 @@ TESTS = resource enginetest paintertest configfile audiocache \
 	audiocachefile audiocacheidmanager audiocacheeventhandler \
 	randomtest atomictest syncedsettingstest imagecachetest \
 	semaphoretest drumkitcreatortest bytesizeparsertest notifiertest \
-	instrumentparsertest drumkitparsertest dgxmlparsertest domloadertest
+	dgxmlparsertest domloadertest
 
 EXTRA_DIST = \
 	dgunit.h \
@@ -195,25 +195,6 @@ notifiertest_SOURCES = \
 	notifiertest.cc \
 	dgtest.cc
 
-instrumentparsertest_CXXFLAGS = -DOUTPUT=\"instrumentparsertest\" \
-	-I$(top_srcdir)/src -I$(top_srcdir)/include
-instrumentparsertest_LDFLAGS = \
-	 $(top_srcdir)/src/libdg.la
-instrumentparsertest_SOURCES = \
-	$(top_srcdir)/hugin/hugin.c \
-	instrumentparsertest.cc \
-	scopedfile.cc \
-	dgtest.cc
-
-drumkitparsertest_CXXFLAGS = -DOUTPUT=\"drumkitparsertest\" \
-	-I$(top_srcdir)/src -I$(top_srcdir)/include
-drumkitparsertest_LDFLAGS = $(top_srcdir)/src/libdg.la
-drumkitparsertest_SOURCES = \
-	$(top_srcdir)/hugin/hugin.c \
-	drumkitparsertest.cc \
-	scopedfile.cc \
-	dgtest.cc
-
 dgxmlparsertest_CXXFLAGS = -DOUTPUT=\"dgxmlparsertest\" \
 	-I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_srcdir)/hugin \
 	-I$(top_srcdir)/pugixml/src
diff --git a/test/drumkitparsertest.cc b/test/drumkitparsertest.cc
deleted file mode 100644
index 10ffeb3..0000000
--- a/test/drumkitparsertest.cc
+++ /dev/null
@@ -1,135 +0,0 @@
-/* -*- Mode: c++ -*- */
-/***************************************************************************
- *            drumkitparsertest.cc
- *
- *  Wed Jun  6 20:39:37 CEST 2018
- *  Copyright 2018 Bent Bisballe Nyeng
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  This file is part of DrumGizmo.
- *
- *  DrumGizmo is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
- */
-#include "dgunit.h"
-
-#include <drumkitparser.h>
-#include <drumkit.h>
-
-#include "scopedfile.h"
-
-class DrumkitParserTest
-	: public DGUnit
-{
-public:
-	DrumkitParserTest()
-	{
-		DGUNIT_TEST(DrumkitParserTest::testTest);
-	}
-
-	Settings settings;
-	Random rand;
-
-	//! This just creates some drumkit.
-	void testTest()
-	{
-		ScopedFile scoped_instrument_file1(
-			"<?xml version='1.0' encoding='UTF-8'?>\n" \
-			"<instrument version=\"2.0\" name=\"Snare\">\n" \
-			" <samples>\n" \
-			"  <sample name=\"Snare-1\" power=\"0.00985718\">\n" \
-			"   <audiofile channel=\"AmbLeft\" file=\"1-Snare.wav\" filechannel=\"1\"/>\n" \
-			"   <audiofile channel=\"AmbRight\" file=\"1-Snare.wav\" filechannel=\"2\"/>\n" \
-			"   <audiofile channel=\"SnareBottom\" file=\"1-Snare.wav\" filechannel=\"12\"/>\n" \
-			"   <audiofile channel=\"SnareTop\" file=\"1-Snare.wav\" filechannel=\"13\"/>\n" \
-			"  </sample>\n" \
-			"  <sample name=\"Snare-2\" power=\"0.0124808\">\n" \
-			"   <audiofile channel=\"AmbLeft\" file=\"2-Snare.wav\" filechannel=\"1\"/>\n" \
-			"   <audiofile channel=\"AmbRight\" file=\"2-Snare.wav\" filechannel=\"2\"/>\n" \
-			"   <audiofile channel=\"SnareBottom\" file=\"2-Snare.wav\" filechannel=\"12\"/>\n" \
-			"   <audiofile channel=\"SnareTop\" file=\"2-Snare.wav\" filechannel=\"13\"/>\n" \
-			"  </sample>\n" \
-			" </samples>\n" \
-			"</instrument>");
-
-		ScopedFile scoped_instrument_file2(
-			"<?xml version='1.0' encoding='UTF-8'?>\n" \
-			"<instrument version=\"2.0\" name=\"Snare\">\n" \
-			" <samples>\n" \
-			"  <sample name=\"Snare-1\" power=\"0.00985718\">\n" \
-			"   <audiofile channel=\"AmbLeft2\" file=\"1-Snare.wav\" filechannel=\"1\"/>\n" \
-			"   <audiofile channel=\"AmbRight2\" file=\"1-Snare.wav\" filechannel=\"2\"/>\n" \
-			"   <audiofile channel=\"SnareBottom2\" file=\"1-Snare.wav\" filechannel=\"12\"/>\n" \
-			"   <audiofile channel=\"SnareTop2\" file=\"1-Snare.wav\" filechannel=\"13\"/>\n" \
-			"  </sample>\n" \
-			"  <sample name=\"Snare-2\" power=\"0.0124808\">\n" \
-			"   <audiofile channel=\"AmbLeft2\" file=\"2-Snare.wav\" filechannel=\"1\"/>\n" \
-			"   <audiofile channel=\"AmbRight2\" file=\"2-Snare.wav\" filechannel=\"2\"/>\n" \
-			"   <audiofile channel=\"SnareBottom2\" file=\"2-Snare.wav\" filechannel=\"12\"/>\n" \
-			"   <audiofile channel=\"SnareTop2\" file=\"2-Snare.wav\" filechannel=\"13\"/>\n" \
-			"  </sample>\n" \
-			" </samples>\n" \
-			"</instrument>");
-
-		ScopedFile scoped_file(
-			std::string(
-			"<?xml version='1.0' encoding='UTF-8'?>\n" \
-			"<drumkit name=\"CrocellKit\" description=\"my description\" samplerate=\"48000\" version=\"2.0.0\">\n" \
-			"  <channels>\n" \
-			"   <channel name=\"AmbLeft\"/>\n" \
-			"   <channel name=\"AmbRight\"/>\n" \
-			"   <channel name=\"SnareTop\"/>\n" \
-			"   <channel name=\"SnareBottom\"/>\n" \
-			"  </channels>\n" \
-			"  <instruments>\n" \
-			"    <instrument name=\"Snare1\" file=\"") + scoped_instrument_file1.filename() + std::string("\">\n" \
-			"      <channelmap in=\"AmbLeft\" out=\"AmbLeft\" main=\"true\"/>\n" \
-			"      <channelmap in=\"AmbRight\" out=\"AmbRight\" main=\"true\"/>\n" \
-			"      <channelmap in=\"SnareTop\" out=\"SnareTop\"/>\n" \
-			"      <channelmap in=\"SnareBottom\" out=\"SnareBottom\"/>\n" \
-			"    </instrument>\n" \
-			"    <instrument name=\"Snare2\" file=\"") + scoped_instrument_file2.filename() + std::string("\">\n" \
-			"      <channelmap in=\"AmbLeft2\" out=\"AmbLeft\" main=\"true\"/>\n" \
-			"      <channelmap in=\"AmbRight2\" out=\"AmbRight\" main=\"true\"/>\n" \
-			"      <channelmap in=\"SnareTop2\" out=\"SnareTop\"/>\n" \
-			"      <channelmap in=\"SnareBottom2\" out=\"SnareBottom\"/>\n" \
-			"    </instrument>\n" \
-			"  </instruments>\n" \
-			"</drumkit>"));
-
-		DrumKit drumkit;
-		DrumKitParser parser(settings, drumkit, rand);
-
-		DGUNIT_ASSERT_EQUAL(0, parser.parseFile(scoped_file.filename()));
-
-		DGUNIT_ASSERT_EQUAL(std::size_t(2), drumkit.instruments.size());
-		DGUNIT_ASSERT_EQUAL(std::size_t(4), drumkit.channels.size());
-
-		DGUNIT_ASSERT_EQUAL(std::string("AmbLeft"), drumkit.channels[0].name);
-		DGUNIT_ASSERT_EQUAL(std::string("AmbRight"), drumkit.channels[1].name);
-		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);
-	}
-};
-
-// Registers the fixture into the 'registry'
-static DrumkitParserTest test;
diff --git a/test/instrumentparsertest.cc b/test/instrumentparsertest.cc
deleted file mode 100644
index 2fb81d0..0000000
--- a/test/instrumentparsertest.cc
+++ /dev/null
@@ -1,158 +0,0 @@
-/* -*- Mode: c++ -*- */
-/***************************************************************************
- *            instrumentparsertest.cc
- *
- *  Wed Jun  6 12:11:16 CEST 2018
- *  Copyright 2018 Bent Bisballe Nyeng
- *  deva@aasimon.org
- ****************************************************************************/
-
-/*
- *  This file is part of DrumGizmo.
- *
- *  DrumGizmo is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  DrumGizmo 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 DrumGizmo; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
- */
-#include "dgunit.h"
-
-#include <instrumentparser.h>
-#include "scopedfile.h"
-
-class InstrumentParserTest
-	: public DGUnit
-{
-public:
-	InstrumentParserTest()
-	{
-		DGUNIT_TEST(InstrumentParserTest::testTest);
-	}
-
-	Settings settings;
-	Random rand;
-
-	//! This just creates some drumkit.
-	void testTest()
-	{
-		ScopedFile scoped_file(
-			"<?xml version='1.0' encoding='UTF-8'?>\n" \
-			"<instrument version=\"2.0\" name=\"Snare\">\n" \
-			" <samples>\n" \
-			"  <sample name=\"Snare-1\" power=\"0.00985718\">\n" \
-			"   <audiofile channel=\"AmbLeft\" file=\"1-Snare.wav\" filechannel=\"1\"/>\n" \
-			"   <audiofile channel=\"AmbRight\" file=\"1-Snare.wav\" filechannel=\"2\"/>\n" \
-			"   <audiofile channel=\"SnareBottom\" file=\"1-Snare.wav\" filechannel=\"12\"/>\n" \
-			"   <audiofile channel=\"SnareTop\" file=\"1-Snare.wav\" filechannel=\"13\"/>\n" \
-			"  </sample>\n" \
-			"  <sample name=\"Snare-2\" power=\"0.0124808\">\n" \
-			"   <audiofile channel=\"AmbLeft\" file=\"2-Snare.wav\" filechannel=\"1\"/>\n" \
-			"   <audiofile channel=\"AmbRight\" file=\"2-Snare.wav\" filechannel=\"2\"/>\n" \
-			"   <audiofile channel=\"SnareBottom\" file=\"2-Snare.wav\" filechannel=\"12\"/>\n" \
-			"   <audiofile channel=\"SnareTop\" file=\"2-Snare.wav\" filechannel=\"13\"/>\n" \
-			"  </sample>\n" \
-			" </samples>\n" \
-			"</instrument>");
-		Instrument instrument(settings, rand);
-		InstrumentParser parser(instrument, settings);
-		DGUNIT_ASSERT_EQUAL(0, parser.parseFile(scoped_file.filename()));
-
-		DGUNIT_ASSERT_EQUAL(std::string(""), instrument._group);
-		DGUNIT_ASSERT_EQUAL(std::string("Snare"), instrument._name);
-		DGUNIT_ASSERT_EQUAL(std::string(""), instrument._description);
-
-		DGUNIT_ASSERT(VersionStr("2.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)
-			{
-				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[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;
-				}
-			}
-		}
-
-//DGUNIT_ASSERT(ref.samples.values == instrument.samples.values);
-		//std::vector<Sample*> samplelist;
-		//std::deque<InstrumentChannel> instrument_channels;
-		//
-		//size_t lastpos;
-		//float mod;
-		//Settings& settings;
-		//Random& rand;
-		//PowerList powerlist;
-	}
-};
-
-// Registers the fixture into the 'registry'
-static InstrumentParserTest test;