LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

better detection of drum staff in GP import

Browse source
This commit is contained in:
lasconic 2013-06-04 22:18:25 +02:00
parent 6355d61922
commit 5618ac09e2
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
mscore/importgtp.cpp
View file

@ -790,7 +790,7 @@ qDebug("BeginRepeat=============================================\n");
Staff* staff = score->staff(i);
int patch = channelDefaults[midiChannel].patch;
ClefType clefId = CLEF_G;
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
clefId = CLEF_PERC;
instr->setUseDrumset(true);
staff->setStaffType(score->staffType(PERCUSSION_STAFF_TYPE));
@ -808,7 +808,7 @@ qDebug("BeginRepeat=============================================\n");
Channel& ch = instr->channel(0);
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
ch.program = 0;
ch.bank = 128;
}
@ -1270,7 +1270,7 @@ qDebug("BeginRepeat=============================================\n");
Staff* staff = score->staff(i);
int patch = channelDefaults[midiChannel].patch;
ClefType clefId = CLEF_G;
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
clefId = CLEF_PERC;
instr->setUseDrumset(true);
staff->setStaffType(score->staffType(PERCUSSION_STAFF_TYPE));
@ -1287,7 +1287,7 @@ qDebug("BeginRepeat=============================================\n");
segment->add(clef);
Channel& ch = instr->channel(0);
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
ch.program = 0;
ch.bank = 128;
}
@ -1788,7 +1788,7 @@ void GuitarPro4::read(QFile* fp)
Staff* staff = score->staff(i);
int patch = channelDefaults[midiChannel].patch;
ClefType clefId = CLEF_G;
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
clefId = CLEF_PERC;
instr->setUseDrumset(true);
staff->setStaffType(score->staffType(PERCUSSION_STAFF_TYPE));
@ -1806,7 +1806,7 @@ void GuitarPro4::read(QFile* fp)
Channel& ch = instr->channel(0);
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
ch.program = 0;
ch.bank = 128;
}
@ -2478,7 +2478,7 @@ void GuitarPro5::readTracks()
//
int patch = channelDefaults[midiChannel].patch;
ClefType clefId = CLEF_G;
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
clefId = CLEF_PERC;
instr->setUseDrumset(true);
staff->setStaffType(score->staffType(PERCUSSION_STAFF_TYPE));
@ -2496,7 +2496,7 @@ void GuitarPro5::readTracks()
Channel& ch = instr->channel(0);
if (c & 0x1 || patch == 0) {
if (midiChannel == GP_DEFAULT_PERCUSSION_CHANNEL) {
ch.program = 0;
ch.bank = 128;
}

1
mscore/importgtp.h
View file

@ -36,6 +36,7 @@ class Tuplet;
static const int GP_MAX_LYRIC_LINES = 5;
static const int GP_MAX_TRACK_NUMBER = 32;
static const int GP_MAX_STRING_NUMBER = 7;
static const int GP_DEFAULT_PERCUSSION_CHANNEL = 9;
static const int GP_INVALID_KEYSIG = 127;