X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmidnam_patch.cc;h=bf841e9a68e398fbe7f991d00e9f6618427ddd3d;hb=25a6aa57a377a1ca2843563cc401a69d1453bd7d;hp=916dfe7be71afdba7db39b35cb57fbb3f794060b;hpb=586484abf0d7816be06879a28c29175d90f03f26;p=ardour.git diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc index 916dfe7be7..bf841e9a68 100644 --- a/libs/midi++2/midnam_patch.cc +++ b/libs/midi++2/midnam_patch.cc @@ -14,10 +14,10 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id$ */ +#include + #include #include @@ -42,7 +42,21 @@ Patch::Patch (std::string name, uint8_t p_number, uint16_t b_number) { } -int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* node) +static int +string_to_int(const XMLTree& tree, const std::string& str) +{ + char* endptr = NULL; + const int i = strtol(str.c_str(), &endptr, 10); + if (str.empty() || *endptr != '\0') { + PBD::error << string_compose("%1: Bad number `%2'", tree.filename(), str) + << endmsg; + } + return i; +} + +static int +initialize_primary_key_from_commands ( + const XMLTree& tree, PatchPrimaryKey& id, const XMLNode* node) { id.bank_number = 0; @@ -51,21 +65,19 @@ int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* no XMLNode* node = *i; if (node->name() == "ControlChange") { - string control = node->property("Control")->value(); - assert(control != ""); - string value = node->property("Value")->value(); - assert(value != ""); + const string& control = node->property("Control")->value(); + const string& value = node->property("Value")->value(); if (control == "0") { - id.bank_number |= (PBD::atoi (value)) << 7; + id.bank_number |= string_to_int(tree, value) << 7; } else if (control == "32") { - id.bank_number |= PBD::atoi (value); + id.bank_number |= string_to_int(tree, value); } } else if (node->name() == "ProgramChange") { - string number = node->property("Number")->value(); + const string& number = node->property("Number")->value(); assert(number != ""); - id.program_number = PBD::atoi(number); + id.program_number = string_to_int(tree, number); } } @@ -96,37 +108,33 @@ Patch::get_state (void) } int -Patch::set_state (const XMLTree&, const XMLNode& node) +Patch::set_state (const XMLTree& tree, const XMLNode& node) { if (node.name() != "Patch") { cerr << "Incorrect node " << node.name() << " handed to Patch" << endl; return -1; } - const XMLProperty* prop = node.property ("Number"); + /* Note there is a "Number" attribute, but it's really more like a label + and is often not numeric. We currently do not use it. */ - if (!prop) { - return -1; + const XMLProperty* program_change = node.property("ProgramChange"); + if (program_change) { + _id.program_number = string_to_int(tree, program_change->value()); } - _id.program_number = PBD::atoi (prop->value()); - prop = node.property ("Name"); - - if (!prop) { + const XMLProperty* name = node.property("Name"); + if (!name) { return -1; } - _name = prop->value(); + _name = name->value(); XMLNode* commands = node.child("PatchMIDICommands"); - if (commands) { - if (initialize_primary_key_from_commands(_id, commands)) { - return -1; + if (initialize_primary_key_from_commands(tree, _id, commands) && + !program_change) { + return -1; // Failed to find a program number anywhere } - } else { - string program_change = node.property("ProgramChange")->value(); - assert(program_change.length()); - _id.program_number = PBD::atoi(program_change); } XMLNode* use_note_name_list = node.child("UsesNoteNameList"); @@ -152,21 +160,17 @@ Note::set_state (const XMLTree& tree, const XMLNode& node) { assert(node.name() == "Note"); - /* If the note number is junk, this will pull a number from the start, or - return zero if there isn't one. The decrement will make that zero - illegal since note numbers in the file are one-based. Better error - detection would be a good idea, but the duplicate check in - NoteNameList::set_state() will probably catch most errors anyway. */ - _number = atoi(node.property("Number")->value().c_str()) - 1; - _name = node.property("Name")->value(); - - if (_number > 127) { + const int num = string_to_int(tree, node.property("Number")->value()); + if (num < 1 || num > 128) { PBD::warning << string_compose("%1: Note number %2 (%3) out of range", - tree.filename(), (int)_number, _name) + tree.filename(), num, _name) << endmsg; return -1; } + _number = num - 1; + _name = node.property("Name")->value(); + return 0; } @@ -236,13 +240,33 @@ Control::get_state (void) } int -Control::set_state (const XMLTree&, const XMLNode& node) +Control::set_state (const XMLTree& tree, const XMLNode& node) { assert(node.name() == "Control"); - _type = node.property("Type")->value(); - _number = node.property("Number")->value(); + if (node.property("Type")) { + _type = node.property("Type")->value(); + } else { + _type = "7bit"; + } + _number = string_to_int(tree, node.property("Number")->value()); _name = node.property("Name")->value(); + for (XMLNodeList::const_iterator i = node.children().begin(); + i != node.children().end(); ++i) { + if ((*i)->name() == "Values") { + // has Min and Max properties, but we don't care + for (XMLNodeList::const_iterator j = (*i)->children().begin(); + j != (*i)->children().end(); ++j) { + if ((*j)->name() == "ValueNameList") { + _value_name_list = boost::shared_ptr(new ValueNameList()); + _value_name_list->set_state(tree, **j); + } else if ((*j)->name() == "UsesValueNameList") { + _value_name_list_name = (*j)->property("Name")->value(); + } + } + } + } + return 0; } @@ -261,18 +285,120 @@ ControlNameList::set_state (const XMLTree& tree, const XMLNode& node) assert(node.name() == "ControlNameList"); _name = node.property("Name")->value(); + _controls.clear(); for (XMLNodeList::const_iterator i = node.children().begin(); i != node.children().end(); ++i) { - if ((*i)->name() != "comment") { + if ((*i)->name() == "Control") { boost::shared_ptr control(new Control()); control->set_state (tree, *(*i)); - _controls.push_back(control); + if (_controls.find(control->number()) == _controls.end()) { + _controls.insert(make_pair(control->number(), control)); + } else { + PBD::warning << string_compose("%1: Duplicate control %2 ignored", + tree.filename(), control->number()) + << endmsg; + } + } + } + + return 0; +} + +boost::shared_ptr +ControlNameList::control(uint16_t num) const +{ + Controls::const_iterator i = _controls.find(num); + if (i != _controls.end()) { + return i->second; + } + return boost::shared_ptr(); +} + +XMLNode& +Value::get_state (void) +{ + XMLNode* node = new XMLNode("Value"); + node->add_property("Number", _number); + node->add_property("Name", _name); + + return *node; +} + +int +Value::set_state (const XMLTree& tree, const XMLNode& node) +{ + assert(node.name() == "Value"); + _number = string_to_int(tree, node.property("Number")->value()); + _name = node.property("Name")->value(); + + return 0; +} + +XMLNode& +ValueNameList::get_state (void) +{ + XMLNode* node = new XMLNode("ValueNameList"); + node->add_property("Name", _name); + + return *node; +} + +int +ValueNameList::set_state (const XMLTree& tree, const XMLNode& node) +{ + assert(node.name() == "ValueNameList"); + const XMLProperty* name_prop = node.property("Name"); + if (name_prop) { + // May be anonymous if written inline within a single tag + _name = name_prop->value(); + } + + _values.clear(); + for (XMLNodeList::const_iterator i = node.children().begin(); + i != node.children().end(); ++i) { + if ((*i)->name() == "Value") { + boost::shared_ptr value(new Value()); + value->set_state (tree, *(*i)); + if (_values.find(value->number()) == _values.end()) { + _values.insert(make_pair(value->number(), value)); + } else { + PBD::warning << string_compose("%1: Duplicate value %2 ignored", + tree.filename(), value->number()) + << endmsg; + } } } return 0; } +boost::shared_ptr +ValueNameList::value(uint16_t num) const +{ + Values::const_iterator i = _values.find(num); + if (i != _values.end()) { + return i->second; + } + return boost::shared_ptr(); +} + +boost::shared_ptr +ValueNameList::max_value_below(uint16_t num) const +{ + Values::const_iterator i = _values.lower_bound(num); + if (i->first == num) { + // Exact match + return i->second; + } else if (i == _values.begin()) { + // No value is < num + return boost::shared_ptr(); + } else { + // Found the smallest element >= num, so the previous one is our result + --i; + return i->second; + } +} + XMLNode& PatchBank::get_state (void) { @@ -297,7 +423,7 @@ PatchBank::set_state (const XMLTree& tree, const XMLNode& node) XMLNode* commands = node.child("MIDICommands"); if (commands) { PatchPrimaryKey id (0, 0); - if (initialize_primary_key_from_commands (id, commands)) { + if (initialize_primary_key_from_commands (tree, id, commands)) { return -1; } _number = id.bank_number; @@ -346,14 +472,14 @@ operator<< (std::ostream& os, const ChannelNameSet& cns) << "List size " << cns._patch_list.size() << endl << "Patch list name = [" << cns._patch_list_name << ']' << endl << "Available channels : "; - for (set::iterator x = cns._available_for_channels.begin(); x != cns._available_for_channels.end(); ++x) { + for (set::const_iterator x = cns._available_for_channels.begin(); x != cns._available_for_channels.end(); ++x) { os << (int) (*x) << ' '; } os << endl; for (ChannelNameSet::PatchBanks::const_iterator pbi = cns._patch_banks.begin(); pbi != cns._patch_banks.end(); ++pbi) { os << "\tPatch Bank " << (*pbi)->name() << " with " << (*pbi)->patch_name_list().size() << " patches\n"; - for (PatchBank::PatchNameList::const_iterator pni = (*pbi)->patch_name_list().begin(); pni != (*pbi)->patch_name_list().end(); ++pni) { + for (PatchNameList::const_iterator pni = (*pbi)->patch_name_list().begin(); pni != (*pbi)->patch_name_list().end(); ++pni) { os << "\t\tPatch name " << (*pni)->name() << " prog " << (int) (*pni)->program_number() << " bank " << (*pni)->bank_number() << endl; } } @@ -372,7 +498,7 @@ ChannelNameSet::set_patch_banks (const ChannelNameSet::PatchBanks& pb) _available_for_channels.clear (); for (PatchBanks::const_iterator pbi = _patch_banks.begin(); pbi != _patch_banks.end(); ++pbi) { - for (PatchBank::PatchNameList::const_iterator pni = (*pbi)->patch_name_list().begin(); pni != (*pbi)->patch_name_list().end(); ++pni) { + for (PatchNameList::const_iterator pni = (*pbi)->patch_name_list().begin(); pni != (*pbi)->patch_name_list().end(); ++pni) { _patch_map[(*pni)->patch_primary_key()] = (*pni); _patch_list.push_back ((*pni)->patch_primary_key()); } @@ -384,9 +510,9 @@ ChannelNameSet::set_patch_banks (const ChannelNameSet::PatchBanks& pb) } void -ChannelNameSet::use_patch_name_list (const PatchBank::PatchNameList& pnl) +ChannelNameSet::use_patch_name_list (const PatchNameList& pnl) { - for (PatchBank::PatchNameList::const_iterator p = pnl.begin(); p != pnl.end(); ++p) { + for (PatchNameList::const_iterator p = pnl.begin(); p != pnl.end(); ++p) { _patch_map[(*p)->patch_primary_key()] = (*p); _patch_list.push_back ((*p)->patch_primary_key()); } @@ -427,7 +553,7 @@ int ChannelNameSet::set_state (const XMLTree& tree, const XMLNode& node) { assert(node.name() == "ChannelNameSet"); - _name = node.property("Name")->value(); + _name = node.property("Name")->value(); const XMLNodeList children = node.children(); for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) { @@ -436,28 +562,27 @@ ChannelNameSet::set_state (const XMLTree& tree, const XMLNode& node) if (node->name() == "AvailableForChannels") { boost::shared_ptr channels = tree.find("//AvailableChannel[@Available = 'true']/@Channel", node); - for(XMLSharedNodeList::const_iterator i = channels->begin(); + for (XMLSharedNodeList::const_iterator i = channels->begin(); i != channels->end(); ++i) { - _available_for_channels.insert(atoi((*i)->attribute_value().c_str())); + _available_for_channels.insert( + string_to_int(tree, (*i)->attribute_value())); } - } - - if (node->name() == "PatchBank") { + } else if (node->name() == "PatchBank") { boost::shared_ptr bank (new PatchBank ()); bank->set_state(tree, *node); _patch_banks.push_back(bank); - const PatchBank::PatchNameList& patches = bank->patch_name_list(); - for (PatchBank::PatchNameList::const_iterator patch = patches.begin(); + const PatchNameList& patches = bank->patch_name_list(); + for (PatchNameList::const_iterator patch = patches.begin(); patch != patches.end(); ++patch) { _patch_map[(*patch)->patch_primary_key()] = *patch; _patch_list.push_back((*patch)->patch_primary_key()); } - } - - if (node->name() == "UsesNoteNameList") { + } else if (node->name() == "UsesNoteNameList") { _note_list_name = node->property ("Name")->value(); + } else if (node->name() == "UsesControlNameList") { + _control_list_name = node->property ("Name")->value(); } } @@ -473,11 +598,11 @@ CustomDeviceMode::set_state(const XMLTree& tree, const XMLNode& a_node) boost::shared_ptr channel_name_set_assignments = tree.find("//ChannelNameSetAssign", const_cast(&a_node)); - for(XMLSharedNodeList::const_iterator i = channel_name_set_assignments->begin(); + for (XMLSharedNodeList::const_iterator i = channel_name_set_assignments->begin(); i != channel_name_set_assignments->end(); ++i) { - int channel = atoi((*i)->property("Channel")->value().c_str()); - string name_set = (*i)->property("NameSet")->value(); + const int channel = string_to_int(tree, (*i)->property("Channel")->value()); + const string& name_set = (*i)->property("NameSet")->value(); assert( 1 <= channel && channel <= 16 ); _channel_name_set_assignments[channel - 1] = name_set; } @@ -501,14 +626,39 @@ CustomDeviceMode::get_state(void) return *custom_device_mode; } +boost::shared_ptr +MasterDeviceNames::value_name_list_by_control(const std::string& mode, uint8_t channel, uint8_t number) +{ + boost::shared_ptr chan_names = channel_name_set_by_channel(mode, channel); + if (!chan_names) { + return boost::shared_ptr(); + } + + boost::shared_ptr control_names = control_name_list(chan_names->control_list_name()); + if (!control_names) { + return boost::shared_ptr(); + } + + boost::shared_ptr control = control_names->control(number); + if (!control) { + return boost::shared_ptr(); + } + + if (!control->value_name_list_name().empty()) { + return value_name_list(control->value_name_list_name()); + } else { + return control->value_name_list(); + } +} + boost::shared_ptr -MasterDeviceNames::custom_device_mode_by_name(std::string mode_name) +MasterDeviceNames::custom_device_mode_by_name(const std::string& mode_name) { return _custom_device_modes[mode_name]; } boost::shared_ptr -MasterDeviceNames::channel_name_set_by_device_mode_and_channel(std::string mode, uint8_t channel) +MasterDeviceNames::channel_name_set_by_channel(const std::string& mode, uint8_t channel) { boost::shared_ptr cdm = custom_device_mode_by_name(mode); boost::shared_ptr cns = _channel_name_sets[cdm->channel_name_set_name_by_channel(channel)]; @@ -516,9 +666,11 @@ MasterDeviceNames::channel_name_set_by_device_mode_and_channel(std::string mode, } boost::shared_ptr -MasterDeviceNames::find_patch(std::string mode, uint8_t channel, const PatchPrimaryKey& key) +MasterDeviceNames::find_patch(const std::string& mode, uint8_t channel, const PatchPrimaryKey& key) { - return channel_name_set_by_device_mode_and_channel(mode, channel)->find_patch(key); + boost::shared_ptr cns = channel_name_set_by_channel(mode, channel); + if (!cns) return boost::shared_ptr(); + return cns->find_patch(key); } boost::shared_ptr @@ -531,6 +683,26 @@ MasterDeviceNames::channel_name_set(const std::string& name) return boost::shared_ptr(); } +boost::shared_ptr +MasterDeviceNames::control_name_list(const std::string& name) +{ + ControlNameLists::const_iterator i = _control_name_lists.find(name); + if (i != _control_name_lists.end()) { + return i->second; + } + return boost::shared_ptr(); +} + +boost::shared_ptr +MasterDeviceNames::value_name_list(const std::string& name) +{ + ValueNameLists::const_iterator i = _value_name_lists.find(name); + if (i != _value_name_lists.end()) { + return i->second; + } + return boost::shared_ptr(); +} + boost::shared_ptr MasterDeviceNames::note_name_list(const std::string& name) { @@ -552,17 +724,16 @@ MasterDeviceNames::note_name(const std::string& mode_name, return ""; } + boost::shared_ptr note_names; boost::shared_ptr patch( find_patch(mode_name, channel, PatchPrimaryKey(program, bank))); - if (!patch) { - return ""; + if (patch) { + note_names = note_name_list(patch->note_list_name()); } - boost::shared_ptr note_names( - note_name_list(patch->note_list_name())); if (!note_names) { /* No note names specific to this patch, check the ChannelNameSet */ - boost::shared_ptr chan_names = channel_name_set_by_device_mode_and_channel( + boost::shared_ptr chan_names = channel_name_set_by_channel( mode_name, channel); if (chan_names) { note_names = note_name_list(chan_names->note_list_name()); @@ -626,7 +797,7 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode&) ++i) { boost::shared_ptr note_name_list(new NoteNameList()); note_name_list->set_state (tree, *(*i)); - _note_name_lists[(*i)->property ("Name")->value()] = note_name_list; + _note_name_lists[note_name_list->name()] = note_name_list; } // ControlNameLists @@ -636,7 +807,17 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode&) ++i) { boost::shared_ptr control_name_list(new ControlNameList()); control_name_list->set_state (tree, *(*i)); - _control_name_lists.push_back(control_name_list); + _control_name_lists[control_name_list->name()] = control_name_list; + } + + // ValueNameLists + boost::shared_ptr value_name_lists = tree.find("/child::MIDINameDocument/child::MasterDeviceNames/child::ValueNameList"); + for (XMLSharedNodeList::iterator i = value_name_lists->begin(); + i != value_name_lists->end(); + ++i) { + boost::shared_ptr value_name_list(new ValueNameList()); + value_name_list->set_state (tree, *(*i)); + _value_name_lists[value_name_list->name()] = value_name_list; } // global/post-facto PatchNameLists @@ -645,7 +826,7 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode&) i != patch_name_lists->end(); ++i) { - PatchBank::PatchNameList patch_name_list; + PatchNameList patch_name_list; const XMLNodeList patches = (*i)->children(); for (XMLNodeList::const_iterator p = patches.begin(); p != patches.end(); ++p) { @@ -668,7 +849,7 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode&) PatchNameLists::iterator p; for (ChannelNameSet::PatchBanks::iterator pb = pbs.begin(); pb != pbs.end(); ++pb) { - std::string pln = (*pb)->patch_list_name(); + const std::string& pln = (*pb)->patch_list_name(); if (!pln.empty()) { if ((p = _patch_name_lists.find (pln)) != _patch_name_lists.end()) { if ((*pb)->set_patch_name_list (p->second)) { @@ -696,12 +877,13 @@ MasterDeviceNames::get_state(void) MIDINameDocument::MIDINameDocument (const string& filename) { - if (!_document.read (filename)) { + XMLTree document; + if (!document.read (filename)) { throw failed_constructor (); } - _document.set_filename (filename); - set_state (_document, *_document.root()); + document.set_filename (filename); + set_state (document, *document.root()); } int