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

fix #22351: Bass stave of multi-stave instrument imports as Grand Piano

Browse source
This commit is contained in:
Andrey M. Tokarev 2013-08-24 22:37:17 +04:00
parent 3d7121d3da
commit ea95e36564
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
mscore/importmidi.cpp
View file

@ -593,6 +593,12 @@ Measure* barFromIndex(const Score *score, int barIndex)
return score->tick2measure(tick);
}
bool isPianoPart(const MTrack &t1, const MTrack &t2)
{
return (t1.mtrack->outChannel() == t2.mtrack->outChannel()
&& (t1.program >= 0 && t1.program <= 7));
}
//---------------------------------------------------------
// createInstruments
// for drum track, if any, set percussion clef
@ -621,9 +627,8 @@ void createInstruments(Score *score, QList<MTrack> &tracks)
const int avgPitch = MChord::findAveragePitch(track.chords.begin(),
track.chords.end());
s->setInitialClef(MidiClef::clefTypeFromAveragePitch(avgPitch));
if ((idx < (ntracks-1))
&& (tracks.at(idx+1).mtrack->outChannel() == track.mtrack->outChannel())
&& (track.program == 0)) {
if (idx < (tracks.size() - 1) && idx >= 0
&& isPianoPart(tracks[idx], tracks[idx + 1])) {
// assume that the current track and the next track
// form a piano part
s->setBracket(0, BRACKET_BRACE);
@ -768,6 +773,8 @@ void createNotes(const ReducedFraction &lastTick, QList<MTrack> &tracks, MidiTyp
processMeta(mt, false);
if (midiType == MT_UNKNOWN)
midiType = MT_GM;
if (i % 2 && isPianoPart(tracks[i - 1], tracks[i]))
mt.name = tracks[i - 1].name;
setTrackInfo(midiType, mt);
// pass current track index to the convertTrack function
// through MidiImportOperations
@ -781,11 +788,21 @@ QList<TrackMeta> getTracksMeta(const std::multimap<int, MTrack> &tracks,
const MidiFile *mf)
{
QList<TrackMeta> tracksMeta;
for (const auto &track: tracks) {
const MTrack &mt = track.second;
const MidiTrack *midiTrack = mt.mtrack;
int i = 0;
for (auto it = tracks.begin(); it != tracks.end(); ++it, ++i) {
if (i % 2) {
auto prev = it;
--prev;
if (isPianoPart(prev->second, it->second)) {
TrackMeta lastMeta = tracksMeta.back();
tracksMeta.push_back(lastMeta);
continue;
}
}
const MTrack &mt = it->second;
QString trackName;
for (const auto &ie: midiTrack->events()) {
for (const auto &ie: mt.mtrack->events()) {
const MidiEvent &e = ie.second;
if ((e.type() == ME_META) && (e.metaType() == META_TRACK_NAME)) {
trackName = (const char*)e.edata();
@ -795,9 +812,9 @@ QList<TrackMeta> getTracksMeta(const std::multimap<int, MTrack> &tracks,
MidiType midiType = mf->midiType();
if (midiType == MT_UNKNOWN)
midiType = MT_GM;
const QString instrName = instrumentName(midiType, mt.program, mt.mtrack->drumTrack());
const bool isDrumTrack = midiTrack->drumTrack();
tracksMeta.push_back({trackName, instrName, isDrumTrack});
const QString instrName = instrumentName(midiType, mt.program,
mt.mtrack->drumTrack());
tracksMeta.push_back({trackName, instrName, mt.mtrack->drumTrack()});
}
return tracksMeta;
}