Fix #18415: Show MIDI channel number on Instrument for inputted MIDI …

…files
musescore · Dec 30, 2014 · df84d02 · df84d02
1 parent 38ceee4
commit df84d02
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/mscore/importmidi/importmidi.cpp b/mscore/importmidi/importmidi.cpp
@@ -849,6 +849,8 @@ void setTrackInfo(MidiType midiType, MTrack &mt)
       if (opers.data()->processingsOfOpenedFile == 0) {
             const int currentTrack = opers.currentTrack();
             opers.data()->trackOpers.instrumentName.setValue(currentTrack, instrName);
+                        // set channel number (from 1): number = index + 1
+            opers.data()->trackOpers.channel.setValue(currentTrack, mt.mtrack->outChannel() + 1);
             }
 
       if (mt.staff->isTop()) {

diff --git a/mscore/importmidi/importmidi_model.cpp b/mscore/importmidi/importmidi_model.cpp
@@ -72,6 +72,21 @@ void TracksModel::reset(const MidiOperations::Opers &opers,
       ++_frozenColCount;
       _columns.push_back(std::unique_ptr<Column>(new Import(_trackOpers)));
 
+      //-----------------------------------------------------------------------
+      struct Channel : Column {
+            Channel(MidiOperations::Opers &opers) : Column(opers) {}
+            QString headerName() const { return QCoreApplication::translate(
+                                                      "MIDI import operations", "Channel"); }
+            bool isEditable() const { return false; }
+            QVariant value(int trackIndex) const
+                  {
+                  return QString::number(_opers.channel.value(trackIndex));
+                  }
+            void setValue(const QVariant &/*value*/, int /*trackIndex*/) {}
+            };
+      ++_frozenColCount;
+      _columns.push_back(std::unique_ptr<Column>(new Channel(_trackOpers)));
+
       //-----------------------------------------------------------------------
       bool hasStaffName = false;
       for (int i = 0; i != _trackCount; ++i) {

diff --git a/mscore/importmidi/importmidi_operations.h b/mscore/importmidi/importmidi_operations.h
@@ -128,6 +128,7 @@ class Op
 struct Opers
       {
                   // data that cannot be changed by the user
+      TrackOp<int> channel = TrackOp<int>(int());
       TrackOp<std::string> staffName = TrackOp<std::string>(std::string());       // will be converted to unicode later
       TrackOp<QString> instrumentName = TrackOp<QString>(QString());
       TrackOp<bool> isDrumTrack = TrackOp<bool>(false);