summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2011-05-14 03:14:33 +0000
committerTim E. Real <termtech@rogers.com>2011-05-14 03:14:33 +0000
commitcce71cb04c36b199b079faa8f6306e43e9605297 (patch)
tree3c37f0769d174f6b471346cce82c40dac9979c44
parentd2f37049cf0b41daa25d1a698c3010a278554956 (diff)
Added GM drums patch in MidiInstrument::populatePatchPopup() for GM songs on ch 10.
-rw-r--r--muse2/ChangeLog1
-rw-r--r--muse2/muse/instruments/minstrument.cpp6
2 files changed, 7 insertions, 0 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 32382091..05f79fe0 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -2,6 +2,7 @@
- New spanish translation from Cristian Ramos (rj)
- Added dialog to remove unused wave files (rj)
- Changed default imported midi song type to GM. (Tim)
+ - Added GM drums patch in MidiInstrument::populatePatchPopup() for GM songs on ch 10. (Tim)
12.05.2011:
- Changed template song "default.med" song type from NO to GM, to help new users. (Tim)
10.05.2011:
diff --git a/muse2/muse/instruments/minstrument.cpp b/muse2/muse/instruments/minstrument.cpp
index 9e52498f..4fde7bf3 100644
--- a/muse2/muse/instruments/minstrument.cpp
+++ b/muse2/muse/instruments/minstrument.cpp
@@ -891,7 +891,13 @@ void MidiInstrument::populatePatchPopup(QMenu* menu, int chan, MType songType, b
case MT_GS: mask = 2; break;
case MT_GM:
if(drumchan)
+ {
+ int id = (0xff << 16) + (0xff << 8) + 0x00; // First patch
+ QAction* act = menu->addAction(gmdrumname);
+ //act->setCheckable(true);
+ act->setData(id);
return;
+ }
mask = 1;
break;
case MT_UNKNOWN: mask = 7; break;