X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmidnam_patch.cc;h=f48ae7b6e2efbdf0b27af622420533616f9162e9;hb=b8b8384a261a547696a0e4400353fceffcb5d284;hp=efc6c1c6a0bd8b424bf45b361d87b81a020b692d;hpb=8f4e126c72f2f47487b2b9addf4914a7f7109440;p=ardour.git

diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc
index efc6c1c6a0..f48ae7b6e2 100644
--- a/libs/midi++2/midnam_patch.cc
+++ b/libs/midi++2/midnam_patch.cc
@@ -35,42 +35,20 @@ namespace MIDI
 
 namespace Name
 {
-
-Patch::Patch (PatchBank* b)
-{
-	use_bank_info (b);
-}
-
-Patch::Patch (std::string a_number, std::string a_name, PatchBank* a_bank)
-	: _number (a_number)
-	, _name (a_name)
-{
-	use_bank_info (a_bank);
-}
-
-XMLNode&
-Patch::get_state (void)
+	
+Patch::Patch (std::string name, uint8_t p_number, uint16_t b_number)
+	: _name (name)
+	, _id (p_number, b_number)
 {
-	XMLNode* node = new XMLNode("Patch");
-	node->add_property("Number", _number);
-	node->add_property("Name",   _name);
-	/*
-	typedef std::list< boost::shared_ptr< Evoral::MIDIEvent<double> > > PatchMidiCommands;
-	XMLNode* commands = node->add_child("PatchMIDICommands");
-	for (PatchMidiCommands::const_iterator event = _patch_midi_commands.begin();
-	    event != _patch_midi_commands.end();
-	    ++event) {
-		commands->add_child_copy(*((((Evoral::MIDIEvent&)*event)).to_xml()));
-	}
-	*/
-
-	return *node;
 }
 
 int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* node)
 {
+	id.bank_number = 0;
+
 	const XMLNodeList events = node->children();
 	for (XMLNodeList::const_iterator i = events.begin(); i != events.end(); ++i) {
+
 		XMLNode* node = *i;
 		if (node->name() == "ControlChange") {
 			string control = node->property("Control")->value();
@@ -79,10 +57,11 @@ int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* no
 			assert(value != "");
 
 			if (control == "0") {
-				id.msb = PBD::atoi(value);
+				id.bank_number |= (PBD::atoi (value)) << 7;
 			} else if (control == "32") {
-				id.lsb = PBD::atoi(value);
+				id.bank_number |= PBD::atoi (value);
 			}
+
 		} else if (node->name() == "ProgramChange") {
 			string number = node->property("Number")->value();
 			assert(number != "");
@@ -93,6 +72,29 @@ int initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* no
 	return 0;
 }
 
+XMLNode&
+Patch::get_state (void)
+{
+	XMLNode* node = new XMLNode("Patch");
+
+	/* XXX this is totally wrong */
+
+	node->add_property("Number", string_compose ("%1", _id.program_number));
+	node->add_property("Name",   _name);
+
+	/*
+	typedef std::list< boost::shared_ptr< Evoral::MIDIEvent<double> > > PatchMidiCommands;
+	XMLNode* commands = node->add_child("PatchMIDICommands");
+	for (PatchMidiCommands::const_iterator event = _patch_midi_commands.begin();
+	    event != _patch_midi_commands.end();
+	    ++event) {
+		commands->add_child_copy(*((((Evoral::MIDIEvent&)*event)).to_xml()));
+	}
+	*/
+
+	return *node;
+}
+
 int
 Patch::set_state (const XMLTree&, const XMLNode& node)
 {
@@ -106,7 +108,7 @@ Patch::set_state (const XMLTree&, const XMLNode& node)
 	if (!prop) {
 		return -1;
 	}
-	_number = prop->value();
+	_id.program_number = PBD::atoi (prop->value());
 
 	prop = node.property ("Name");
 
@@ -127,24 +129,6 @@ Patch::set_state (const XMLTree&, const XMLNode& node)
 		_id.program_number = PBD::atoi(program_change);
 	}
 
-	return 0;
-}
-
-int
-Patch::use_bank_info (PatchBank* bank)
-{
-	if (bank) {
-		if (bank->patch_primary_key() ) {
-			_id.msb = bank->patch_primary_key()->msb;
-			_id.lsb = bank->patch_primary_key()->lsb;
-		} else {
-			return -1;
-		}
-	}
-
-	if (!_id.is_sane()) {
-		return -1;
-	}
 
 	return 0;
 }
@@ -159,6 +143,7 @@ Note::get_state (void)
 	return *node;
 }
 
+
 int
 Note::set_state (const XMLTree&, const XMLNode& node)
 {
@@ -218,10 +203,11 @@ PatchBank::set_state (const XMLTree& tree, const XMLNode& node)
 
 	XMLNode* commands = node.child("MIDICommands");
 	if (commands) {
-		_id = new PatchPrimaryKey();
-		if (initialize_primary_key_from_commands(*_id, commands)) {
+		PatchPrimaryKey id (0, 0);
+		if (initialize_primary_key_from_commands (id, commands)) {
 			return -1;
 		}
+		_number = id.bank_number;
 	}
 
 	XMLNode* patch_name_list = node.child("PatchNameList");
@@ -229,14 +215,14 @@ PatchBank::set_state (const XMLTree& tree, const XMLNode& node)
 	if (patch_name_list) {
 		const XMLNodeList patches = patch_name_list->children();
 		for (XMLNodeList::const_iterator i = patches.begin(); i != patches.end(); ++i) {
-			boost::shared_ptr<Patch> patch(new Patch(this));
+			boost::shared_ptr<Patch> patch (new Patch (string(), 0, _number));
 			patch->set_state(tree, *(*i));
 			_patch_name_list.push_back(patch);
 		}
 	} else {
 		XMLNode* use_patch_name_list = node.child ("UsesPatchNameList");
 		if (use_patch_name_list) {
-			_patch_list_name = node.property ("Name")->value();
+			_patch_list_name = use_patch_name_list->property ("Name")->value();
 		} else {
 			error << "Patch without patch name list - patchfile will be ignored" << endmsg;
 			return -1;
@@ -251,16 +237,68 @@ PatchBank::set_patch_name_list (const PatchNameList& pnl)
 {
 	_patch_name_list = pnl;
 	_patch_list_name = "";
-	
+
 	for (PatchNameList::iterator p = _patch_name_list.begin(); p != _patch_name_list.end(); p++) {
-		if ((*p)->use_bank_info (this)) {
-			return -1;
-		}
+		(*p)->set_bank_number (_number);
 	}
 
 	return 0;
 }
 
+std::ostream&
+operator<< (std::ostream& os, const ChannelNameSet& cns)
+{
+	os << "Channel Name Set: name = " << cns._name << endl
+	   << "Map size " << cns._patch_map.size () << endl
+	   << "List size " << cns._patch_list.size() << endl
+	   << "Patch list name = [" << cns._patch_list_name << ']' << endl
+	   << "Available channels : ";
+	for (set<uint8_t>::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) {
+			os << "\t\tPatch name " << (*pni)->name() << " prog " << (int) (*pni)->program_number() << " bank " << (*pni)->bank_number() << endl;
+		}
+	}
+
+	return os;
+}
+
+void
+ChannelNameSet::set_patch_banks (const ChannelNameSet::PatchBanks& pb)
+{
+	_patch_banks = pb;
+	
+	_patch_map.clear ();
+	_patch_list.clear ();
+	_patch_list_name = "";
+	_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) {
+			_patch_map[(*pni)->patch_primary_key()] = (*pni);
+			_patch_list.push_back ((*pni)->patch_primary_key());
+		}
+	}
+
+	for (uint8_t n = 0; n < 16; ++n) {
+		_available_for_channels.insert (n);
+	}
+}
+
+void
+ChannelNameSet::use_patch_name_list (const PatchBank::PatchNameList& pnl)
+{
+	for (PatchBank::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());
+	}
+}
+
 XMLNode&
 ChannelNameSet::get_state (void)
 {
@@ -297,13 +335,14 @@ ChannelNameSet::set_state (const XMLTree& tree, const XMLNode& node)
 {
 	assert(node.name() == "ChannelNameSet");
 	_name   = node.property("Name")->value();
+
 	const XMLNodeList children = node.children();
 	for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
 		XMLNode* node = *i;
 		assert(node);
 		if (node->name() == "AvailableForChannels") {
 			boost::shared_ptr<XMLSharedNodeList> channels =
-				tree.find("//AvailableChannel[@Available = 'true']/@Channel");
+				tree.find("//AvailableChannel[@Available = 'true']/@Channel", node);
 			for(XMLSharedNodeList::const_iterator i = channels->begin();
 			    i != channels->end();
 			    ++i) {
@@ -312,7 +351,7 @@ ChannelNameSet::set_state (const XMLTree& tree, const XMLNode& node)
 		}
 
 		if (node->name() == "PatchBank") {
-			boost::shared_ptr<PatchBank> bank(new PatchBank());
+			boost::shared_ptr<PatchBank> bank (new PatchBank ());
 			bank->set_state(tree, *node);
 			_patch_banks.push_back(bank);
 			const PatchBank::PatchNameList& patches = bank->patch_name_list();
@@ -336,7 +375,7 @@ CustomDeviceMode::set_state(const XMLTree& tree, const XMLNode& a_node)
 	_name = a_node.property("Name")->value();
 
 	boost::shared_ptr<XMLSharedNodeList> channel_name_set_assignments =
-		tree.find("//ChannelNameSetAssign");
+		tree.find("//ChannelNameSetAssign", const_cast<XMLNode *>(&a_node));
 	for(XMLSharedNodeList::const_iterator i = channel_name_set_assignments->begin();
 	    i != channel_name_set_assignments->end();
 	    ++i) {
@@ -365,13 +404,35 @@ CustomDeviceMode::get_state(void)
 	return *custom_device_mode;
 }
 
+boost::shared_ptr<CustomDeviceMode> 
+MasterDeviceNames::custom_device_mode_by_name(std::string mode_name)
+{
+	// can't assert this, since in many of the patch files the mode name is empty
+	//assert(mode_name != "");
+	return _custom_device_modes[mode_name];
+}
+
+boost::shared_ptr<ChannelNameSet> 
+MasterDeviceNames::channel_name_set_by_device_mode_and_channel(std::string mode, uint8_t channel)
+{
+	boost::shared_ptr<CustomDeviceMode> cdm = custom_device_mode_by_name(mode);
+	boost::shared_ptr<ChannelNameSet> cns =  _channel_name_sets[cdm->channel_name_set_name_by_channel(channel)];
+	return cns;
+}
+
+boost::shared_ptr<Patch> 
+MasterDeviceNames::find_patch(std::string mode, uint8_t channel, PatchPrimaryKey& key) 
+{
+	return channel_name_set_by_device_mode_and_channel(mode, channel)->find_patch(key);
+}
+
 int
 MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode& a_node)
 {
 	// Manufacturer
 	boost::shared_ptr<XMLSharedNodeList> manufacturer = tree.find("//Manufacturer");
 	assert(manufacturer->size() == 1);
-	_manufacturer = manufacturer->front()->content();
+	_manufacturer = manufacturer->front()->children().front()->content();
 
 	// Models
 	boost::shared_ptr<XMLSharedNodeList> models = tree.find("//Model");
@@ -428,7 +489,7 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode& a_node)
 		const XMLNodeList patches = (*i)->children();
 
 		for (XMLNodeList::const_iterator p = patches.begin(); p != patches.end(); ++p) {
-			boost::shared_ptr<Patch> patch(new Patch());
+			boost::shared_ptr<Patch> patch (new Patch ());
 			patch->set_state(tree, *(*p));
 			patch_name_list.push_back(patch);
 		}
@@ -444,20 +505,23 @@ MasterDeviceNames::set_state(const XMLTree& tree, const XMLNode& a_node)
 
 	for (ChannelNameSets::iterator cns = _channel_name_sets.begin(); cns != _channel_name_sets.end(); ++cns) {
 		ChannelNameSet::PatchBanks pbs = cns->second->patch_banks();
+		PatchNameLists::iterator p;
+
 		for (ChannelNameSet::PatchBanks::iterator pb = pbs.begin(); pb != pbs.end(); ++pb) {
 			std::string pln = (*pb)->patch_list_name();
 			if (!pln.empty()) {
-				PatchNameLists::iterator p = _patch_name_lists.find (pln);
-				if (p != _patch_name_lists.end()) {
+				if ((p = _patch_name_lists.find (pln)) != _patch_name_lists.end()) {
 					if ((*pb)->set_patch_name_list (p->second)) {
 						return -1;
 					}
+					cns->second->use_patch_name_list (p->second);
 				} else {
 					error << string_compose ("Patch list name %1 was not found - patch file ignored", pln) << endmsg;
 					return -1;
 				}
 			}
 		}
+
 	}
 
 	return 0;
@@ -475,7 +539,7 @@ MIDINameDocument::MIDINameDocument (const string& filename)
 	if (!_document.read (filename)) {
 		throw failed_constructor ();
 	}
-	
+
 	set_state (_document, *_document.root());
 }
 
@@ -489,7 +553,10 @@ MIDINameDocument::set_state (const XMLTree& tree, const XMLNode& a_node)
 		error << "No author information in MIDNAM file" << endmsg;
 		return -1;
 	}
-	_author = author->front()->content();
+	
+	if (author->front()->children().size() > 0) {
+		_author = author->front()->children().front()->content();
+	}
 
 	// MasterDeviceNames
 
@@ -525,6 +592,136 @@ MIDINameDocument::get_state(void)
 	return nothing;
 }
 
+const char* general_midi_program_names[128] = {
+	"Acoustic Grand Piano",
+	"Bright Acoustic Piano",
+	"Electric Grand Piano",
+	"Honky-tonk Piano",
+	"Rhodes Piano",
+	"Chorused Piano",
+	"Harpsichord",
+	"Clavinet",
+	"Celesta",
+	"Glockenspiel",
+	"Music Box",
+	"Vibraphone",
+	"Marimba",
+	"Xylophone",
+	"Tubular Bells",
+	"Dulcimer",
+	"Hammond Organ",
+	"Percussive Organ",
+	"Rock Organ",
+	"Church Organ",
+	"Reed Organ",
+	"Accordion",
+	"Harmonica",
+	"Tango Accordion",
+	"Acoustic Guitar (nylon)",
+	"Acoustic Guitar (steel)",
+	"Electric Guitar (jazz)",
+	"Electric Guitar (clean)",
+	"Electric Guitar (muted)",
+	"Overdriven Guitar",
+	"Distortion Guitar",
+	"Guitar Harmonics",
+	"Acoustic Bass",
+	"Electric Bass (finger)",
+	"Electric Bass (pick)",
+	"Fretless Bass",
+	"Slap Bass 1",
+	"Slap Bass 2",
+	"Synth Bass 1",
+	"Synth Bass 2",
+	"Violin",
+	"Viola",
+	"Cello",
+	"Contrabass",
+	"Tremolo Strings",
+	"Pizzicato Strings",
+	"Orchestral Harp",
+	"Timpani",
+	"String Ensemble 1",
+	"String Ensemble 2",
+	"SynthStrings 1",
+	"SynthStrings 2",
+	"Choir Aahs",
+	"Voice Oohs",
+	"Synth Voice",
+	"Orchestra Hit",
+	"Trumpet",
+	"Trombone",
+	"Tuba",
+	"Muted Trumpet",
+	"French Horn",
+	"Brass Section",
+	"Synth Brass 1",
+	"Synth Brass 2",
+	"Soprano Sax",
+	"Alto Sax",
+	"Tenor Sax",
+	"Baritone Sax",
+	"Oboe",
+	"English Horn",
+	"Bassoon",
+	"Clarinet",
+	"Piccolo",
+	"Flute",
+	"Recorder",
+	"Pan Flute",
+	"Bottle Blow",
+	"Shakuhachi",
+	"Whistle",
+	"Ocarina",
+	"Lead 1 (square)",
+	"Lead 2 (sawtooth)",
+	"Lead 3 (calliope lead)",
+	"Lead 4 (chiff lead)",
+	"Lead 5 (charang)",
+	"Lead 6 (voice)",
+	"Lead 7 (fifths)",
+	"Lead 8 (bass + lead)",
+	"Pad 1 (new age)",
+	"Pad 2 (warm)",
+	"Pad 3 (polysynth)",
+	"Pad 4 (choir)",
+	"Pad 5 (bowed)",
+	"Pad 6 (metallic)",
+	"Pad 7 (halo)",
+	"Pad 8 (sweep)",
+	"FX 1 (rain)",
+	"FX 2 (soundtrack)",
+	"FX 3 (crystal)",
+	"FX 4 (atmosphere)",
+	"FX 5 (brightness)",
+	"FX 6 (goblins)",
+	"FX 7 (echoes)",
+	"FX 8 (sci-fi)",
+	"Sitar",
+	"Banjo",
+	"Shamisen",
+	"Koto",
+	"Kalimba",
+	"Bagpipe",
+	"Fiddle",
+	"Shanai",
+	"Tinkle Bell",
+	"Agogo",
+	"Steel Drums",
+	"Woodblock",
+	"Taiko Drum",
+	"Melodic Tom",
+	"Synth Drum",
+	"Reverse Cymbal",
+	"Guitar Fret Noise",
+	"Breath Noise",
+	"Seashore",
+	"Bird Tweet",
+	"Telephone Ring",
+	"Helicopter",
+	"Applause",
+	"Gunshot",
+};
 
 } //namespace Name