Merge pull request #1372 from Igevorse/import-export

Export port information to MIDI and MusicXML
musescore · Oct 31, 2014 · f4b9318 · f4b9318
2 parents 1ffb9f3 + c148f49
commit f4b9318
Show file tree

Hide file tree

Showing 93 changed files with 144 additions and 1 deletion.
diff --git a/libmscore/part.cpp b/libmscore/part.cpp
@@ -237,6 +237,15 @@ int Part::midiChannel() const
       return score()->midiChannel(instr(0)->channel(0).channel);
       }
 
+//---------------------------------------------------------
+//   midiPort
+//---------------------------------------------------------
+
+int Part::midiPort() const
+      {
+      return score()->midiPort(instr(0)->channel(0).channel);
+      }
+
 //---------------------------------------------------------
 //   setMidiChannel
 //    called from importmusicxml

diff --git a/libmscore/part.h b/libmscore/part.h
@@ -103,6 +103,7 @@ class Part : public QObject {
       void setMidiProgram(int, int bank = 0);
 
       int midiChannel() const;
+      int midiPort() const;
       void setMidiChannel(int) const;
 
       void insertStaff(Staff*, int idx);

diff --git a/mscore/exportmidi.cpp b/mscore/exportmidi.cpp
@@ -230,7 +230,7 @@ bool ExportMidi::write(const QString& name, bool midiExpandRepeats)
             Staff* staff = cs->staff(staffIdx);
             Part* part   = staff->part();
             int channel  = part->midiChannel();
-            track.setOutPort(0);
+            track.setOutPort(part->midiPort());
             track.setOutChannel(channel);
 
             if (staff->isTop()) {
@@ -260,6 +260,16 @@ bool ExportMidi::write(const QString& name, bool midiExpandRepeats)
             EventMap events;
             cs->renderStaff(&events, staff);
 
+            // Export port to MIDI META event
+            MidiEvent ev;
+            ev.setType(ME_META);
+            ev.setMetaType(META_PORT_CHANGE);
+            ev.setLen(1);
+            unsigned char* data = new unsigned char[1];
+            data[0] = int(track.outPort());
+            ev.setEData(data);
+            track.insert(0, ev);
+
             for (auto i = events.begin(); i != events.end(); ++i) {
                   NPlayEvent event(i->second);
                   int eventChannel = cs->midiChannel(event.channel());

diff --git a/mscore/exportxml.cpp b/mscore/exportxml.cpp
@@ -4069,6 +4069,8 @@ void ExportMusicXml::write(QIODevice* dev)
                               xml.etag();
                               }
                         }
+                  xml.tag(QString("midi-device port=\"%1\"").arg(part->midiPort() + 1), "");
+
                   for (int i = 0; i < 128; ++i) {
                         DrumInstrument di = drumset->drum(i);
                         if (di.notehead != NoteHead::Group::HEAD_INVALID) {
@@ -4089,6 +4091,8 @@ void ExportMusicXml::write(QIODevice* dev)
                   xml.tag("instrument-name", MScoreTextToMXML::toPlainText(part->longName()));
                   xml.etag();
 
+                  xml.tag(QString("midi-device id=\"P%1-I%2\" port=\"%3\"").arg(idx+1).arg(3).arg(part->midiPort() + 1), "");
+
                   xml.stag(QString("midi-instrument id=\"P%1-I%2\"").arg(idx+1).arg(3));
                   if (part->midiChannel() >= 0) // <0 is not valid
                         xml.tag("midi-channel", part->midiChannel() + 1);

diff --git a/mscore/importmidi.cpp b/mscore/importmidi.cpp
@@ -269,6 +269,9 @@ void MTrack::processMeta(int tick, const MidiEvent& mm)
                   break;
             case META_TIME_SIGNATURE:
                   break;                  // added earlier
+            case META_PORT_CHANGE:
+                  // TODO
+                  break;
             default:
                   if (MScore::debugMode)
                         qDebug("unknown meta type 0x%02x", mm.metaType());

diff --git a/mscore/importxml.cpp b/mscore/importxml.cpp
@@ -1558,6 +1558,10 @@ void MusicXml::xmlScorePart(QDomElement e, QString id, int& parts)
                               domError(ee);
                         }
                   }
+            else if (e.tagName() == "midi-device") {
+                  // TODO
+                  domNotImplemented(e);
+                  }
             else
                   domError(e);
             }

diff --git a/mtest/musicxml/io/testAccidentals1.xml b/mtest/musicxml/io/testAccidentals1.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Staff 1</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testAccidentals2.xml b/mtest/musicxml/io/testAccidentals2.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Staff 1</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testAccidentals3.xml b/mtest/musicxml/io/testAccidentals3.xml
@@ -16,6 +16,7 @@
       <score-instrument id="P1-I3">
         <instrument-name></instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>74</midi-program>

diff --git a/mtest/musicxml/io/testArpGliss1.xml b/mtest/musicxml/io/testArpGliss1.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testArpGliss2.xml b/mtest/musicxml/io/testArpGliss2.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testArpGliss3.xml b/mtest/musicxml/io/testArpGliss3.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testBarStyles.xml b/mtest/musicxml/io/testBarStyles.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Staff 1</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testChordDiagrams1.xml b/mtest/musicxml/io/testChordDiagrams1.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name></instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testChordNoVoice_ref.xml b/mtest/musicxml/io/testChordNoVoice_ref.xml
@@ -17,6 +17,7 @@
       <score-instrument id="P1-I3">
         <instrument-name></instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testClefs1.xml b/mtest/musicxml/io/testClefs1.xml
@@ -17,6 +17,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Staff 1</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testCompleteMeasureRests.xml b/mtest/musicxml/io/testCompleteMeasureRests.xml
@@ -17,6 +17,7 @@
       <score-instrument id="P1-I3">
         <instrument-name></instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>74</midi-program>

diff --git a/mtest/musicxml/io/testDCalCoda.xml b/mtest/musicxml/io/testDCalCoda.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Guitar</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDCalFine.xml b/mtest/musicxml/io/testDCalFine.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Guitar</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDalSegno.xml b/mtest/musicxml/io/testDalSegno.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Guitar</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDirections1.xml b/mtest/musicxml/io/testDirections1.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Staff 1</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDrumset1.xml b/mtest/musicxml/io/testDrumset1.xml
@@ -40,6 +40,7 @@
       <score-instrument id="P1-I65">
         <instrument-name>low conga</instrument-name>
         </score-instrument>
+      <midi-device port="1"></midi-device>
       <midi-instrument id="P1-I36">
         <midi-channel>10</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDrumset2.xml b/mtest/musicxml/io/testDrumset2.xml
@@ -28,6 +28,7 @@
       <score-instrument id="P1-I64">
         <instrument-name>open high conga</instrument-name>
         </score-instrument>
+      <midi-device port="1"></midi-device>
       <midi-instrument id="P1-I36">
         <midi-channel>10</midi-channel>
         <midi-program>1</midi-program>
@@ -63,6 +64,7 @@
       <score-instrument id="P2-I64">
         <instrument-name>open high conga</instrument-name>
         </score-instrument>
+      <midi-device port="1"></midi-device>
       <midi-instrument id="P2-I64">
         <midi-channel>10</midi-channel>
         <midi-program>1</midi-program>
@@ -77,6 +79,7 @@
       <score-instrument id="P3-I39">
         <instrument-name>Acoustic Snare</instrument-name>
         </score-instrument>
+      <midi-device port="1"></midi-device>
       <midi-instrument id="P3-I39">
         <midi-channel>10</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDurationRoundingError_ref.xml b/mtest/musicxml/io/testDurationRoundingError_ref.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Guitar</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>25</midi-program>

diff --git a/mtest/musicxml/io/testDynamics1.xml b/mtest/musicxml/io/testDynamics1.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Staff 1</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDynamics2.xml b/mtest/musicxml/io/testDynamics2.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>
@@ -30,6 +31,7 @@
       <score-instrument id="P2-I3">
         <instrument-name>Piano</instrument-name>
         </score-instrument>
+      <midi-device id="P2-I3" port="1"></midi-device>
       <midi-instrument id="P2-I3">
         <midi-channel>2</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testDynamics3_ref.xml b/mtest/musicxml/io/testDynamics3_ref.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>
@@ -30,6 +31,7 @@
       <score-instrument id="P2-I3">
         <instrument-name>Piano</instrument-name>
         </score-instrument>
+      <midi-device id="P2-I3" port="1"></midi-device>
       <midi-instrument id="P2-I3">
         <midi-channel>2</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testEmptyMeasure_ref.xml b/mtest/musicxml/io/testEmptyMeasure_ref.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Flute</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>74</midi-program>

diff --git a/mtest/musicxml/io/testEmptyVoice1_ref.xml b/mtest/musicxml/io/testEmptyVoice1_ref.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>
@@ -30,6 +31,7 @@
       <score-instrument id="P2-I3">
         <instrument-name>Piano</instrument-name>
         </score-instrument>
+      <midi-device id="P2-I3" port="1"></midi-device>
       <midi-instrument id="P2-I3">
         <midi-channel>2</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testFiguredBass1.xml b/mtest/musicxml/io/testFiguredBass1.xml
@@ -19,6 +19,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Bass Guitar</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>35</midi-program>

diff --git a/mtest/musicxml/io/testFiguredBass2.xml b/mtest/musicxml/io/testFiguredBass2.xml
@@ -19,6 +19,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Flute</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>74</midi-program>
@@ -32,6 +33,7 @@
       <score-instrument id="P2-I3">
         <instrument-name>Harpsichord</instrument-name>
         </score-instrument>
+      <midi-device id="P2-I3" port="1"></midi-device>
       <midi-instrument id="P2-I3">
         <midi-channel>2</midi-channel>
         <midi-program>7</midi-program>

diff --git a/mtest/musicxml/io/testGrace1.xml b/mtest/musicxml/io/testGrace1.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testGrace2.xml b/mtest/musicxml/io/testGrace2.xml
@@ -18,6 +18,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testHarmony1.xml b/mtest/musicxml/io/testHarmony1.xml
@@ -17,6 +17,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Music</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testHarmony2.xml b/mtest/musicxml/io/testHarmony2.xml
@@ -17,6 +17,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Music</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testHarmony3.xml b/mtest/musicxml/io/testHarmony3.xml
@@ -19,6 +19,7 @@
       <score-instrument id="P1-I3">
         <instrument-name>Voice</instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>53</midi-program>

diff --git a/mtest/musicxml/io/testHarmony4.xml b/mtest/musicxml/io/testHarmony4.xml
@@ -17,6 +17,7 @@
       <score-instrument id="P1-I3">
         <instrument-name></instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>1</midi-program>

diff --git a/mtest/musicxml/io/testHarmony5.xml b/mtest/musicxml/io/testHarmony5.xml
@@ -13,6 +13,7 @@
       <score-instrument id="P1-I3">
         <instrument-name></instrument-name>
         </score-instrument>
+      <midi-device id="P1-I3" port="1"></midi-device>
       <midi-instrument id="P1-I3">
         <midi-channel>1</midi-channel>
         <midi-program>74</midi-program>