From 592f05fa549c7e680e502f569c27e71177361ad6 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 23 Jun 2018 09:02:37 +0200 Subject: Remove the old instrument and drumkit parser code as well as version 1.0 kit handling (velocity range maps). --- src/drumkitparser.cc | 263 --------------------------------------------------- 1 file changed, 263 deletions(-) delete mode 100644 src/drumkitparser.cc (limited to 'src/drumkitparser.cc') diff --git a/src/drumkitparser.cc b/src/drumkitparser.cc deleted file mode 100644 index 7966d06..0000000 --- a/src/drumkitparser.cc +++ /dev/null @@ -1,263 +0,0 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/*************************************************************************** - * drumkitparser.cc - * - * Tue Jul 22 16:24:59 CEST 2008 - * Copyright 2008 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 "drumkitparser.h" - -#include -#include -#include - -#include "cpp11fix.h" -#include "instrumentparser.h" -#include "path.h" -#include "drumgizmo.h" - -DrumKitParser::DrumKitParser(Settings& settings, DrumKit& k, Random& rand) - : kit(k) - , refs(REFSFILE) - , settings(settings) - , rand(rand) -{ -} - -int DrumKitParser::parseFile(const std::string& filename) -{ - settings.has_bleed_control.store(false); - - auto edited_filename(filename); - - if(refs.load()) - { - if((filename.size() > 1) && (filename[0] == '@')) - { - edited_filename = refs.getValue(filename.substr(1)); - } - } - else - { - WARN(drumkitparser, "Error reading refs.conf"); - } - - path = getPath(edited_filename); - auto result = SAXParser::parseFile(edited_filename); - - if(result == 0) - { - kit._file = edited_filename; - } - - return result; -} - -void DrumKitParser::startTag(const std::string& name, const attr_t& attr) -{ - if(name == "drumkit") - { - if(attr.find("name") != attr.end()) - { - kit._name = attr.at("name"); - } - - if(attr.find("samplerate") != attr.end()) - { - kit._samplerate = std::stoi(attr.at("samplerate")); - } - else - { - // If 'samplerate' attribute is missing, assume 44k1Hz - // TODO: Ask instrument what samplerate is in the audiofiles... - kit._samplerate = 44100; - } - - if(attr.find("description") != attr.end()) - { - kit._description = attr.at("description"); - } - - if(attr.find("version") != attr.end()) - { - try - { - kit._version = VersionStr(attr.at("version")); - } - catch(const char *err) - { - ERR(kitparser, "Error parsing version number: %s, using 1.0\n", err); - kit._version = VersionStr(1,0,0); - } - } - else - { - WARN(kitparser, "Missing version number, assuming 1.0\n"); - kit._version = VersionStr(1,0,0); - } - } - - if(name == "channels") - { - - } - - if(name == "channel") - { - if(attr.find("name") == attr.end()) - { - ERR(kitparser, "Missing channel name.\n"); - return; - } - - Channel c(attr.at("name")); - c.num = kit.channels.size(); - kit.channels.push_back(c); - } - - if(name == "instruments") - { - - } - - if(name == "instrument") - { - if(attr.find("name") == attr.end()) - { - ERR(kitparser, "Missing name in instrument tag.\n"); - return; - } - - if(attr.find("file") == attr.end()) - { - ERR(kitparser, "Missing file in instrument tag.\n"); - return; - } - - instr_name = attr.at("name"); - instr_file = attr.at("file"); - if(attr.find("group") != attr.end()) - { - instr_group = attr.at("group"); - } - else - { - instr_group = ""; - } - } - - if(name == "channelmap") - { - if(attr.find("in") == attr.end()) - { - ERR(kitparser, "Missing 'in' in channelmap tag.\n"); - return; - } - - if(attr.find("out") == attr.end()) - { - ERR(kitparser, "Missing 'out' in channelmap tag.\n"); - return; - } - - channel_attribute_t cattr{attr.at("out"), main_state_t::unset}; - if(attr.find("main") != attr.end()) - { - cattr.main_state = (attr.at("main") == "true") ? - main_state_t::is_main : main_state_t::is_not_main; - if(cattr.main_state == main_state_t::is_main) - { - settings.has_bleed_control.store(true); - } - } - - channelmap[attr.at("in")] = cattr; - } -} - -void DrumKitParser::endTag(const std::string& name) -{ - if(name == "instrument") - { - { - // Scope the std::unique_ptr 'ptr' so we don't accidentally use it after - // it is std::move'd to the instruments list. - auto ptr = std::make_unique(settings, rand); - ptr->setGroup(instr_group); - - InstrumentParser parser(*ptr, settings); - parser.parseFile(path + "/" + instr_file); - - // Transfer ownership to the DrumKit object. - kit.instruments.emplace_back(std::move(ptr)); - } - - auto& instrument = *kit.instruments.back(); - - // Only use main attribute from drumkit file if at least one exists. - main_state_t default_main_state = main_state_t::unset; - for(const auto& channel: channelmap) - { - if(channel.second.main_state != main_state_t::unset) - { - default_main_state = main_state_t::is_not_main; - } - } - - // Assign kit channel numbers to instruments channels and reset - // main_state attribute as needed. - for(auto& instrument_channel: instrument.instrument_channels) - { - channel_attribute_t cattr{instrument_channel.name, main_state_t::unset}; - if(channelmap.find(instrument_channel.name) != channelmap.end()) - { - cattr = channelmap[instrument_channel.name]; - } - - if(cattr.main_state == main_state_t::unset) - { - cattr.main_state = default_main_state; - } - - if(cattr.main_state != main_state_t::unset) - { - instrument_channel.main = cattr.main_state; - } - - for(auto cnt = 0u; cnt < kit.channels.size(); ++cnt) - { - if(kit.channels[cnt].name == cattr.cname) - { - instrument_channel.num = kit.channels[cnt].num; - } - } - - if(instrument_channel.num == NO_CHANNEL) - { - ERR(kitparser, "Missing channel '%s' in instrument '%s'\n", - instrument_channel.name.c_str(), instrument.getName().c_str()); - } - } - - channelmap.clear(); - } -} -- cgit v1.2.3