From 078145252bb2af965205a91310253bf07e0ff279 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Sat, 19 Jan 2013 02:33:28 +0000
Subject: Fix invalid XML.  All midnam files now pass validation by xmllint.

git-svn-id: svn://localhost/ardour2/branches/3.0@13886 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 patchfiles/Korg_Karma.midnam      |  20 -----
 patchfiles/Korg_Triton.midnam     |  20 -----
 patchfiles/Line_6_ModPro.midnam   |   2 +-
 patchfiles/MIDINameDocument10.dtd | 162 ++++++++++++++++++++++++++++++++++++++
 patchfiles/Roland_JP-8080.midnam  |  42 ----------
 patchfiles/Roland_JV-1080.midnam  | 152 -----------------------------------
 patchfiles/Roland_M-BD1.midnam    |  22 ------
 patchfiles/Yamaha_MOTIF_XS.midnam |  20 -----
 8 files changed, 163 insertions(+), 277 deletions(-)
 create mode 100644 patchfiles/MIDINameDocument10.dtd

(limited to 'patchfiles')

diff --git a/patchfiles/Korg_Karma.midnam b/patchfiles/Korg_Karma.midnam
index 77d9a4b6e6..d25db2b4d1 100755
--- a/patchfiles/Korg_Karma.midnam
+++ b/patchfiles/Korg_Karma.midnam
@@ -27,26 +27,6 @@
 			</ChannelNameSetAssignments>
 
 		</CustomDeviceMode>
-		<ChannelNameSet Name="Combinations">
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-		</ChannelNameSet>
 
 		<ChannelNameSet Name="Programs">
 			<AvailableForChannels>
diff --git a/patchfiles/Korg_Triton.midnam b/patchfiles/Korg_Triton.midnam
index 283115f2dd..768e42a733 100755
--- a/patchfiles/Korg_Triton.midnam
+++ b/patchfiles/Korg_Triton.midnam
@@ -27,26 +27,6 @@
 			</ChannelNameSetAssignments>
 
 		</CustomDeviceMode>
-		<ChannelNameSet Name="Combinations">
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-		</ChannelNameSet>
 
 		<ChannelNameSet Name="Programs">
 			<AvailableForChannels>
diff --git a/patchfiles/Line_6_ModPro.midnam b/patchfiles/Line_6_ModPro.midnam
index 53cafd0805..a55bc49dda 100644
--- a/patchfiles/Line_6_ModPro.midnam
+++ b/patchfiles/Line_6_ModPro.midnam
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE MIDINameDocument PUBLIC "-//MIDI Manufacturers Association//DTD MIDINameDocument 1.0//EN" "http://www.sonosphere.com/dtds/MIDINameDocument.dtd">
+<!DOCTYPE MIDINameDocument PUBLIC "-//MIDI Manufacturers Association//DTD MIDINameDocument 1.0//EN" "http://www.midi.org/dtds/MIDINameDocument10.dtd">
 
 <MIDINameDocument>
 	<Author>File generated with CherryPicker by Rob Martin 2003</Author>
diff --git a/patchfiles/MIDINameDocument10.dtd b/patchfiles/MIDINameDocument10.dtd
new file mode 100644
index 0000000000..24befd1de0
--- /dev/null
+++ b/patchfiles/MIDINameDocument10.dtd
@@ -0,0 +1,162 @@
+<!--
+	XML DTD for MIDINameDocument
+	
+	Version 1.0, 19 January 2003
+	
+	Formal Public Identifier:
+		"-//MIDI Manufacturers Association//DTD MIDINameDocument 1.0//EN"
+	URI:
+		"http://www.midi.org/dtds/MIDINameDocument10.dtd"
+-->
+
+<!--
+	ENTITIES - used internally
+-->
+
+<!ENTITY % namelist "PatchNameList | NoteNameList | ControlNameList | ValueNameList">
+<!ENTITY % noteorctl_listorref "(NoteNameList | UsesNoteNameList)?, (ControlNameList | 
+								UsesControlNameList)?">
+
+<!--
+	ELEMENTS AND ATTRIBUTES
+-->
+
+<!ELEMENT MIDINameDocument	(Author, (MasterDeviceNames+ | ExtendingDeviceNames+ | 
+							StandardDeviceMode+)) >
+
+<!ELEMENT Author (#PCDATA)>
+
+<!ELEMENT MasterDeviceNames		(((Manufacturer, Model+) | Device), 
+								(CustomDeviceMode | SupportsStandardDeviceMode)+, 
+								ChannelNameSet*, (%namelist;)*) >
+
+<!ELEMENT ExtendingDeviceNames	(((Manufacturer, Model+)? | Device), (%namelist;)+) >
+
+<!ELEMENT Manufacturer (#PCDATA)>
+
+<!ELEMENT Model (#PCDATA)>
+
+<!ELEMENT Device EMPTY>
+<!ATTLIST Device
+				Name		CDATA	#REQUIRED
+				UniqueID	NMTOKEN	#REQUIRED>
+
+<!ELEMENT StandardDeviceMode (DeviceModeEnable?, DeviceModeDisable?, ChannelNameSetAssignments, 
+								ChannelNameSet+, (%namelist;)*) >
+<!ATTLIST StandardDeviceMode
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT CustomDeviceMode (DeviceModeEnable?, DeviceModeDisable?, ChannelNameSetAssignments, 
+								(%namelist;)*) >
+<!ATTLIST CustomDeviceMode
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT DeviceModeEnable	(MIDICommands)>
+<!ELEMENT DeviceModeDisable	(MIDICommands)>
+
+<!ELEMENT SupportsStandardDeviceMode EMPTY>
+<!ATTLIST SupportsStandardDeviceMode
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT ChannelNameSetAssignments (ChannelNameSetAssign+)>
+<!ELEMENT ChannelNameSetAssign EMPTY>
+<!ATTLIST ChannelNameSetAssign
+				Channel		NMTOKEN			#REQUIRED
+				NameSet		CDATA			#REQUIRED>
+
+<!ELEMENT ChannelNameSet	(AvailableForChannels, %noteorctl_listorref;, PatchBank+) >
+<!ATTLIST ChannelNameSet
+				Name		CDATA			#REQUIRED>
+
+<!ELEMENT AvailableForChannels (AvailableChannel+)>
+<!ELEMENT AvailableChannel EMPTY>
+<!ATTLIST AvailableChannel
+				Channel		NMTOKEN			#REQUIRED
+				Available	(false | true)	"true">
+
+<!ELEMENT PatchBank (MIDICommands?, (UsesPatchNameList | PatchNameList))>
+<!ATTLIST PatchBank
+				Name		CDATA			#IMPLIED
+				ROM			(false | true)	"false">
+
+<!ELEMENT UsesPatchNameList EMPTY>
+<!ATTLIST UsesPatchNameList
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT PatchNameList (Patch*)>
+<!ATTLIST PatchNameList
+				Name	CDATA	#IMPLIED>
+
+<!ELEMENT Patch (PatchMIDICommands?, ChannelNameSetAssignments?, %noteorctl_listorref; ) >
+<!ATTLIST Patch
+				Number			CDATA	#REQUIRED
+				Name			CDATA	#REQUIRED
+				ProgramChange	NMTOKEN	#IMPLIED>
+
+<!ELEMENT UsesNoteNameList EMPTY>
+<!ATTLIST UsesNoteNameList
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT NoteNameList (NoteGroup | Note)+>
+<!ATTLIST NoteNameList
+				Name	CDATA	#IMPLIED>
+
+<!ELEMENT NoteGroup (Note*)>
+<!ATTLIST NoteGroup
+				Name	CDATA	#IMPLIED>
+
+<!ELEMENT Note EMPTY>
+<!ATTLIST Note
+				Number	NMTOKEN	#REQUIRED
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT UsesControlNameList EMPTY>
+<!ATTLIST UsesControlNameList
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT ControlNameList (Control+)>
+<!ATTLIST ControlNameList
+				Name	CDATA	#IMPLIED>
+
+<!ELEMENT Control (Values?)>
+<!ATTLIST Control
+				Type	(7bit | 14bit | RPN | NRPN)	"7bit"
+				Number	NMTOKEN						#REQUIRED
+				Name	CDATA						#REQUIRED>
+
+<!ELEMENT Values (ValueNameList | UsesValueNameList)?>
+<!ATTLIST Values
+				Min		NMTOKEN	#REQUIRED
+				Max		NMTOKEN	#REQUIRED
+				Default	NMTOKEN	#IMPLIED
+				Units	NMTOKEN	#IMPLIED
+				Mapping	NMTOKEN	#IMPLIED>
+
+<!ELEMENT UsesValueNameList EMPTY>
+<!ATTLIST UsesValueNameList
+				Name	CDATA	#REQUIRED>
+
+<!ELEMENT ValueNameList (Value+)>
+<!ATTLIST ValueNameList
+				Name	CDATA	#IMPLIED>
+
+<!ELEMENT Value EMPTY>
+<!ATTLIST Value
+				Number	NMTOKEN	#REQUIRED
+				Name	CDATA	#REQUIRED>
+
+<!--
+	Include MIDI.dtd, defining elements referenced by MIDICommands
+-->
+<!ENTITY % ChannelRequired "#IMPLIED">
+<!ENTITY % MIDIDTD PUBLIC	"-//MIDI Manufacturers Association//DTD MIDIEvents 1.0//EN"
+							"http://www.midi.org/dtds/MIDIEvents10.dtd" >
+%MIDIDTD;
+
+<!ELEMENT MIDICommands (MIDIDelay | %MIDIChannelMessage; | SysEx)+ >
+<!ELEMENT PatchMIDICommands (MIDIDelay | %MIDIChannelMessage; )+ >
+
+<!ELEMENT MIDIDelay EMPTY>
+<!ATTLIST MIDIDelay
+				Milliseconds	CDATA	#REQUIRED>
+
diff --git a/patchfiles/Roland_JP-8080.midnam b/patchfiles/Roland_JP-8080.midnam
index c0e7b94e93..9affb37164 100755
--- a/patchfiles/Roland_JP-8080.midnam
+++ b/patchfiles/Roland_JP-8080.midnam
@@ -77,48 +77,6 @@
 			</PatchBank>
 		</ChannelNameSet>
 
-		<ChannelNameSet Name="Performances">
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-		</ChannelNameSet>
-
-		<ChannelNameSet Name="Drums">
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-
-		</ChannelNameSet>
 
 		<PatchNameList Name="User Patches">
 			<Patch Number="User-1" Name="MG Bass" ProgramChange="0" />
diff --git a/patchfiles/Roland_JV-1080.midnam b/patchfiles/Roland_JV-1080.midnam
index 712d4f4bda..969b15088c 100755
--- a/patchfiles/Roland_JV-1080.midnam
+++ b/patchfiles/Roland_JV-1080.midnam
@@ -1851,158 +1851,6 @@
 				</PatchNameList>
 			</PatchBank>
 		</ChannelNameSet>
-		<ChannelNameSet Name="Name Set 3" >
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-			<PatchBank Name="" >
-				<PatchNameList>
-					<Patch Name="" ProgramChange="0" />
-					<Patch Name="" ProgramChange="1" />
-					<Patch Name="" ProgramChange="2" />
-					<Patch Name="" ProgramChange="3" />
-					<Patch Name="" ProgramChange="4" />
-					<Patch Name="" ProgramChange="5" />
-					<Patch Name="" ProgramChange="6" />
-					<Patch Name="" ProgramChange="7" />
-					<Patch Name="" ProgramChange="8" />
-					<Patch Name="" ProgramChange="9" />
-					<Patch Name="" ProgramChange="10" />
-					<Patch Name="" ProgramChange="11" />
-					<Patch Name="" ProgramChange="12" />
-					<Patch Name="" ProgramChange="13" />
-					<Patch Name="" ProgramChange="14" />
-					<Patch Name="" ProgramChange="15" />
-					<Patch Name="" ProgramChange="16" />
-					<Patch Name="" ProgramChange="17" />
-					<Patch Name="" ProgramChange="18" />
-					<Patch Name="" ProgramChange="19" />
-					<Patch Name="" ProgramChange="20" />
-					<Patch Name="" ProgramChange="21" />
-					<Patch Name="" ProgramChange="22" />
-					<Patch Name="" ProgramChange="23" />
-					<Patch Name="" ProgramChange="24" />
-					<Patch Name="" ProgramChange="25" />
-					<Patch Name="" ProgramChange="26" />
-					<Patch Name="" ProgramChange="27" />
-					<Patch Name="" ProgramChange="28" />
-					<Patch Name="" ProgramChange="29" />
-					<Patch Name="" ProgramChange="30" />
-					<Patch Name="" ProgramChange="31" />
-					<Patch Name="" ProgramChange="32" />
-					<Patch Name="" ProgramChange="33" />
-					<Patch Name="" ProgramChange="34" />
-					<Patch Name="" ProgramChange="35" />
-					<Patch Name="" ProgramChange="36" />
-					<Patch Name="" ProgramChange="37" />
-					<Patch Name="" ProgramChange="38" />
-					<Patch Name="" ProgramChange="39" />
-					<Patch Name="" ProgramChange="40" />
-					<Patch Name="" ProgramChange="41" />
-					<Patch Name="" ProgramChange="42" />
-					<Patch Name="" ProgramChange="43" />
-					<Patch Name="" ProgramChange="44" />
-					<Patch Name="" ProgramChange="45" />
-					<Patch Name="" ProgramChange="46" />
-					<Patch Name="" ProgramChange="47" />
-					<Patch Name="" ProgramChange="48" />
-					<Patch Name="" ProgramChange="49" />
-					<Patch Name="" ProgramChange="50" />
-					<Patch Name="" ProgramChange="51" />
-					<Patch Name="" ProgramChange="52" />
-					<Patch Name="" ProgramChange="53" />
-					<Patch Name="" ProgramChange="54" />
-					<Patch Name="" ProgramChange="55" />
-					<Patch Name="" ProgramChange="56" />
-					<Patch Name="" ProgramChange="57" />
-					<Patch Name="" ProgramChange="58" />
-					<Patch Name="" ProgramChange="59" />
-					<Patch Name="" ProgramChange="60" />
-					<Patch Name="" ProgramChange="61" />
-					<Patch Name="" ProgramChange="62" />
-					<Patch Name="" ProgramChange="63" />
-					<Patch Name="" ProgramChange="64" />
-					<Patch Name="" ProgramChange="65" />
-					<Patch Name="" ProgramChange="66" />
-					<Patch Name="" ProgramChange="67" />
-					<Patch Name="" ProgramChange="68" />
-					<Patch Name="" ProgramChange="69" />
-					<Patch Name="" ProgramChange="70" />
-					<Patch Name="" ProgramChange="71" />
-					<Patch Name="" ProgramChange="72" />
-					<Patch Name="" ProgramChange="73" />
-					<Patch Name="" ProgramChange="74" />
-					<Patch Name="" ProgramChange="75" />
-					<Patch Name="" ProgramChange="76" />
-					<Patch Name="" ProgramChange="77" />
-					<Patch Name="" ProgramChange="78" />
-					<Patch Name="" ProgramChange="79" />
-					<Patch Name="" ProgramChange="80" />
-					<Patch Name="" ProgramChange="81" />
-					<Patch Name="" ProgramChange="82" />
-					<Patch Name="" ProgramChange="83" />
-					<Patch Name="" ProgramChange="84" />
-					<Patch Name="" ProgramChange="85" />
-					<Patch Name="" ProgramChange="86" />
-					<Patch Name="" ProgramChange="87" />
-					<Patch Name="" ProgramChange="88" />
-					<Patch Name="" ProgramChange="89" />
-					<Patch Name="" ProgramChange="90" />
-					<Patch Name="" ProgramChange="91" />
-					<Patch Name="" ProgramChange="92" />
-					<Patch Name="" ProgramChange="93" />
-					<Patch Name="" ProgramChange="94" />
-					<Patch Name="" ProgramChange="95" />
-					<Patch Name="" ProgramChange="96" />
-					<Patch Name="" ProgramChange="97" />
-					<Patch Name="" ProgramChange="98" />
-					<Patch Name="" ProgramChange="99" />
-					<Patch Name="" ProgramChange="100" />
-					<Patch Name="" ProgramChange="101" />
-					<Patch Name="" ProgramChange="102" />
-					<Patch Name="" ProgramChange="103" />
-					<Patch Name="" ProgramChange="104" />
-					<Patch Name="" ProgramChange="105" />
-					<Patch Name="" ProgramChange="106" />
-					<Patch Name="" ProgramChange="107" />
-					<Patch Name="" ProgramChange="108" />
-					<Patch Name="" ProgramChange="109" />
-					<Patch Name="" ProgramChange="110" />
-					<Patch Name="" ProgramChange="111" />
-					<Patch Name="" ProgramChange="112" />
-					<Patch Name="" ProgramChange="113" />
-					<Patch Name="" ProgramChange="114" />
-					<Patch Name="" ProgramChange="115" />
-					<Patch Name="" ProgramChange="116" />
-					<Patch Name="" ProgramChange="117" />
-					<Patch Name="" ProgramChange="118" />
-					<Patch Name="" ProgramChange="119" />
-					<Patch Name="" ProgramChange="120" />
-					<Patch Name="" ProgramChange="121" />
-					<Patch Name="" ProgramChange="122" />
-					<Patch Name="" ProgramChange="123" />
-					<Patch Name="" ProgramChange="124" />
-					<Patch Name="" ProgramChange="125" />
-					<Patch Name="" ProgramChange="126" />
-					<Patch Name="" ProgramChange="127" />
-				</PatchNameList>
-			</PatchBank>
-		</ChannelNameSet>
 		<NoteNameList Name="User Kit A: HouseDrumSet" >
 			<NoteGroup Name="Hi-Hat" >
 			</NoteGroup> 
diff --git a/patchfiles/Roland_M-BD1.midnam b/patchfiles/Roland_M-BD1.midnam
index db0d4866a5..49c9954da4 100755
--- a/patchfiles/Roland_M-BD1.midnam
+++ b/patchfiles/Roland_M-BD1.midnam
@@ -63,28 +63,6 @@
 			</PatchBank>
 		</ChannelNameSet>
 
-		<ChannelNameSet Name="Drums">
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-
-		</ChannelNameSet>
-
 		<PatchNameList Name="Programs 5000">
 			<Patch Number="Bs/Drm(A)-1" Name="Marcus 3way" ProgramChange="0" />
 			<Patch Number="Bs/Drm(A)-2" Name="MM Slap Bass" ProgramChange="1" />
diff --git a/patchfiles/Yamaha_MOTIF_XS.midnam b/patchfiles/Yamaha_MOTIF_XS.midnam
index 7d5428b66d..b43af7e03f 100644
--- a/patchfiles/Yamaha_MOTIF_XS.midnam
+++ b/patchfiles/Yamaha_MOTIF_XS.midnam
@@ -102,26 +102,6 @@
 				<UsesPatchNameList Name="PRE8" />
 			</PatchBank>
 		</ChannelNameSet>
-		<ChannelNameSet Name="User Presets" >
-			<AvailableForChannels>
-				<AvailableChannel Channel="1" Available="true" />
-				<AvailableChannel Channel="2" Available="true" />
-				<AvailableChannel Channel="3" Available="true" />
-				<AvailableChannel Channel="4" Available="true" />
-				<AvailableChannel Channel="5" Available="true" />
-				<AvailableChannel Channel="6" Available="true" />
-				<AvailableChannel Channel="7" Available="true" />
-				<AvailableChannel Channel="8" Available="true" />
-				<AvailableChannel Channel="9" Available="true" />
-				<AvailableChannel Channel="10" Available="true" />
-				<AvailableChannel Channel="11" Available="true" />
-				<AvailableChannel Channel="12" Available="true" />
-				<AvailableChannel Channel="13" Available="true" />
-				<AvailableChannel Channel="14" Available="true" />
-				<AvailableChannel Channel="15" Available="true" />
-				<AvailableChannel Channel="16" Available="true" />
-			</AvailableForChannels>
-		</ChannelNameSet>
 		<ChannelNameSet Name="General Midi" >
 			<AvailableForChannels>
 				<AvailableChannel Channel="1" Available="true" />
-- 
cgit v1.2.3