Merge pull request #6268 from MarcSabatella/harmony-channel-program

fix #302710: change default for harmony channel to piano
musescore · Jul 7, 2020 · a931719 · a931719
2 parents b0d82ff + e1c56fd
commit a931719
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 19 deletions.
diff --git a/libmscore/part.cpp b/libmscore/part.cpp
@@ -599,6 +599,8 @@ void Part::updateHarmonyChannels(bool isDoOnInstrumentChanged, bool checkRemoval
       if (!harmonyChannel() && harmonyCount() > 0) {
             Instrument* instr = instrument();
             Channel* c = new Channel(*instr->channel(0));
+            // default to program 0, which is piano in General MIDI
+            c->setProgram(0);
             c->setName(Channel::HARMONY_NAME);
             instr->appendChannel(c);
             onInstrumentChanged();

diff --git a/mtest/libmscore/chordsymbol/add-link-ref.mscx b/mtest/libmscore/chordsymbol/add-link-ref.mscx
@@ -71,7 +71,7 @@
           <program value="24"/>
           </Channel>
         <Channel name="harmony">
-          <program value="24"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/chordsymbol/add-part-ref.mscx b/mtest/libmscore/chordsymbol/add-part-ref.mscx
@@ -64,7 +64,7 @@
           <program value="24"/>
           </Channel>
         <Channel name="harmony">
-          <program value="24"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>
@@ -162,7 +162,7 @@
             <program value="24"/>
             </Channel>
           <Channel name="harmony">
-            <program value="24"/>
+            <program value="0"/>
             </Channel>
           </Instrument>
         </Part>

diff --git a/mtest/libmscore/chordsymbol/extend-ref.mscx b/mtest/libmscore/chordsymbol/extend-ref.mscx
@@ -64,7 +64,7 @@
           <program value="27"/>
           </Channel>
         <Channel name="harmony">
-          <program value="27"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/chordsymbol/no-system-ref.mscx b/mtest/libmscore/chordsymbol/no-system-ref.mscx
@@ -95,7 +95,7 @@
           <program value="65"/>
           </Channel>
         <Channel name="harmony">
-          <program value="65"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>
@@ -358,7 +358,7 @@
             <program value="65"/>
             </Channel>
           <Channel name="harmony">
-            <program value="65"/>
+            <program value="0"/>
             </Channel>
           </Instrument>
         </Part>

diff --git a/mtest/libmscore/chordsymbol/realize-transpose-ref.mscx b/mtest/libmscore/chordsymbol/realize-transpose-ref.mscx
@@ -69,7 +69,7 @@
           <program value="73"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/chordsymbol/transpose-part-ref.mscx b/mtest/libmscore/chordsymbol/transpose-part-ref.mscx
@@ -69,7 +69,7 @@
           <program value="73"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>
@@ -182,7 +182,7 @@
             <program value="73"/>
             </Channel>
           <Channel name="harmony">
-            <program value="73"/>
+            <program value="0"/>
             </Channel>
           </Instrument>
         </Part>

diff --git a/mtest/libmscore/chordsymbol/transpose-ref.mscx b/mtest/libmscore/chordsymbol/transpose-ref.mscx
@@ -69,7 +69,7 @@
           <program value="73"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/compat114/chord_symbol-ref.mscx b/mtest/libmscore/compat114/chord_symbol-ref.mscx
@@ -80,7 +80,7 @@
           <controller ctrl="91" value="30"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           <controller ctrl="93" value="30"/>
           <controller ctrl="91" value="30"/>
           </Channel>

diff --git a/mtest/libmscore/compat114/text_scaling-ref.mscx b/mtest/libmscore/compat114/text_scaling-ref.mscx
@@ -80,7 +80,7 @@
           <controller ctrl="91" value="30"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           <controller ctrl="93" value="30"/>
           <controller ctrl="91" value="30"/>
           </Channel>

diff --git a/mtest/libmscore/compat206/lidemptytext-ref.mscx b/mtest/libmscore/compat206/lidemptytext-ref.mscx
@@ -179,7 +179,7 @@
           <program value="44"/>
           </Channel>
         <Channel name="harmony">
-          <program value="43"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>
@@ -351,7 +351,7 @@
             <program value="44"/>
             </Channel>
           <Channel name="harmony">
-            <program value="43"/>
+            <program value="0"/>
             </Channel>
           </Instrument>
         </Part>

diff --git a/mtest/libmscore/copypaste/copypaste19-ref.mscx b/mtest/libmscore/copypaste/copypaste19-ref.mscx
@@ -54,6 +54,7 @@
         <Channel>
           </Channel>
         <Channel name="harmony">
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/copypaste/copypaste26-ref.mscx b/mtest/libmscore/copypaste/copypaste26-ref.mscx
@@ -81,6 +81,7 @@
         <Channel>
           </Channel>
         <Channel name="harmony">
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-01-ref.mscx
@@ -55,7 +55,7 @@
           <program value="73"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx b/mtest/libmscore/copypastesymbollist/copypastesymbollist-chordnames-ref.mscx
@@ -55,7 +55,7 @@
           <program value="52"/>
           </Channel>
         <Channel name="harmony">
-          <program value="52"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/selectionrangedelete/selectionrangedelete05-ref.mscx b/mtest/libmscore/selectionrangedelete/selectionrangedelete05-ref.mscx
@@ -70,7 +70,7 @@
           <program value="44"/>
           </Channel>
         <Channel name="harmony">
-          <program value="40"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/timesig/timesig-03-ref.mscx b/mtest/libmscore/timesig/timesig-03-ref.mscx
@@ -55,7 +55,7 @@
           <program value="73"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>

diff --git a/mtest/libmscore/timesig/timesig-05-ref.mscx b/mtest/libmscore/timesig/timesig-05-ref.mscx
@@ -58,7 +58,7 @@
           <program value="73"/>
           </Channel>
         <Channel name="harmony">
-          <program value="73"/>
+          <program value="0"/>
           </Channel>
         </Instrument>
       </Part>