Part 1 of loading 2.X sessions; some things work, some things don't, hacks a-plenty.

LOADING 2.X SESSIONS WITH THIS COMMIT IN PLACE WILL (PROBABLY) CORRUPT THE .ardour FILE,
MAKING THE SESSION UNLOADABLE ON 2.X AND LOSING INFORMATION.

So don't do that unless you make a backup of the session file first.



git-svn-id: svn://localhost/ardour2/branches/3.0@5786 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 8 deletions

diff --git a/libs/midi++2/midnam_patch.cc b/libs/midi++2/midnam_patch.cc
index 5a0c0fe147..815ebd4b37 100644
--- a/libs/midi++2/midnam_patch.cc
+++ b/libs/midi++2/midnam_patch.cc
@@ -77,7 +77,7 @@ void initialize_primary_key_from_commands (PatchPrimaryKey& id, const XMLNode* n
 
 
 int
-Patch::set_state (const XMLNode& node)
+Patch::set_state (const XMLNode& node, int version)
 {
 	assert(node.name() == "Patch");
 	_number = node.property("Number")->value();
@@ -116,7 +116,7 @@ Note::get_state (void)
 }
 
 int
-Note::set_state (const XMLNode& node)
+Note::set_state (const XMLNode& node, int version)
 {
 	assert(node.name() == "Note");
 	_number = node.property("Number")->value();
@@ -135,7 +135,7 @@ NoteNameList::get_state (void)
 }
 
 int
-NoteNameList::set_state (const XMLNode& node)
+NoteNameList::set_state (const XMLNode& node, int version)
 {
 	assert(node.name() == "NoteNameList");
 	_name   = node.property("Name")->value();
@@ -168,7 +168,7 @@ PatchBank::get_state (void)
 }
 
 int
-PatchBank::set_state (const XMLNode& node)
+PatchBank::set_state (const XMLNode& node, int version)
 {
 	assert(node.name() == "PatchBank");
 	_name   = node.property("Name")->value();
@@ -223,7 +223,7 @@ ChannelNameSet::get_state (void)
 }
 
 int
-ChannelNameSet::set_state (const XMLNode& node)
+ChannelNameSet::set_state (const XMLNode& node, int version)
 {
 	assert(node.name() == "ChannelNameSet");
 	_name   = node.property("Name")->value();
@@ -270,7 +270,7 @@ ChannelNameSet::set_state (const XMLNode& node)
 }
 
 int
-CustomDeviceMode::set_state(const XMLNode& a_node)
+CustomDeviceMode::set_state(const XMLNode& a_node, int version)
 {
 	assert(a_node.name() == "CustomDeviceMode");
 	
@@ -307,7 +307,7 @@ CustomDeviceMode::get_state(void)
 }
 
 int
-MasterDeviceNames::set_state(const XMLNode& a_node)
+MasterDeviceNames::set_state(const XMLNode& a_node, int version)
 {
 	// cerr << "MasterDeviceNames::set_state Manufacturer" << endl;
 	// Manufacturer
@@ -376,7 +376,7 @@ MasterDeviceNames::get_state(void)
 }
 
 int
-MIDINameDocument::set_state(const XMLNode& a_node)
+MIDINameDocument::set_state(const XMLNode& a_node, int version)
 {
 	// Author
 	boost::shared_ptr<XMLSharedNodeList> author = a_node.find("//Author");