diff --git a/mscore/importgtp-gp4.cpp b/mscore/importgtp-gp4.cpp index 9f38e90..9d8f910 100644 --- a/mscore/importgtp-gp4.cpp +++ b/mscore/importgtp-gp4.cpp @@ -631,7 +631,7 @@ void GuitarPro4::read(QFile* fp) Clef* clef = new Clef(score); clef->setClefType(clefId); clef->setTrack(i * VOICES); - Segment* segment = measure->getSegment(Segment::Type::Clef, measure->tick()); + Segment* segment = measure->getSegment(Segment::Type::Clef, 0); segment->add(clef); if (capo > 0) { diff --git a/mscore/importgtp-gp5.cpp b/mscore/importgtp-gp5.cpp index f6ad4e1..75567c1 100644 --- a/mscore/importgtp-gp5.cpp +++ b/mscore/importgtp-gp5.cpp @@ -437,7 +437,7 @@ void GuitarPro5::readTracks() Clef* clef = new Clef(score); clef->setClefType(clefId); clef->setTrack(i * VOICES); - Segment* segment = measure->getSegment(Segment::Type::Clef, measure->tick()); + Segment* segment = measure->getSegment(Segment::Type::Clef, 0); segment->add(clef); if (capo > 0) { diff --git a/mscore/importgtp-gp6.cpp b/mscore/importgtp-gp6.cpp index 33a27a6..1013788 100644 --- a/mscore/importgtp-gp6.cpp +++ b/mscore/importgtp-gp6.cpp @@ -1443,35 +1441,11 @@ void GuitarPro6::readBars(QDomNode* barList, Measure* measure, ClefType oldClefI // get the clef of the bar and apply if (!currentNode.nodeName().compare("Clef")) { QString clefString = currentNode.toElement().text(); - QDomNode nextNode = currentNode.nextSibling(); - QString clefOctave; - if (!nextNode.nodeName().compare("Ottavia")) - clefOctave = nextNode.toElement().text(); - ClefType clefId = ClefType::G; - if (!clefString.compare("F4")) { - clefId = ClefType::F; - if (clefOctave == "8va") - clefId = ClefType::F_8VA; - if (clefOctave == "8vb") - clefId = ClefType::F8; - if (clefOctave == "15ma") - clefId = ClefType::F_15MA; - if (clefOctave == "15mb") - clefId = ClefType::F15; - } - else if (!clefString.compare("G2")) { - clefId = ClefType::G; - if (clefOctave == "8va") - clefId = ClefType::G1; - if (clefOctave == "8vb") - clefId = ClefType::G3; - if (clefOctave == "15ma") - clefId = ClefType::G2; - } - else if (!clefString.compare("C3")) - clefId = ClefType::C3; - else if (!clefString.compare("C4")) - clefId = ClefType::C4; + ClefType clefId = ClefType::G3; + if (!clefString.compare("F4")) + clefId = ClefType::F8; + else if (!clefString.compare("G2")) + clefId = ClefType::G3; else if (!clefString.compare("Neutral")) clefId = ClefType::PERC; else @@ -1482,7 +1456,7 @@ void GuitarPro6::readBars(QDomNode* barList, Measure* measure, ClefType oldClefI // only add the clef to the bar if it differs from previous measure if (measure->prevMeasure()) { if (clefId != oldClefId[staffIdx]) { - Segment* segment = measure->getSegment(Segment::Type::Clef, tick); + Segment* segment = measure->getSegment(Segment::Type::Clef, 0); segment->add(newClef); oldClefId[staffIdx] = clefId; } @@ -1490,7 +1464,7 @@ void GuitarPro6::readBars(QDomNode* barList, Measure* measure, ClefType oldClefI delete newClef; } else { - Segment* segment = measure->getSegment(Segment::Type::Clef, tick); + Segment* segment = measure->getSegment(Segment::Type::Clef, 0); segment->add(newClef); oldClefId[staffIdx] = clefId; } diff --git a/mscore/importgtp.cpp b/mscore/importgtp.cpp index 71e4ef9..38f309d 100644 --- a/mscore/importgtp.cpp +++ b/mscore/importgtp.cpp @@ -1333,7 +1331,7 @@ void GuitarPro2::read(QFile* fp) Clef* clef = new Clef(score); clef->setClefType(clefId); clef->setTrack(i * VOICES); - Segment* segment = measure->getSegment(Segment::Type::Clef, tick); + Segment* segment = measure->getSegment(Segment::Type::Clef, 0); segment->add(clef); if (capo > 0) { @@ -1950,7 +1948,7 @@ void GuitarPro3::read(QFile* fp) Clef* clef = new Clef(score); clef->setClefType(clefId); clef->setTrack(i * VOICES); - Segment* segment = measure->getSegment(Segment::Type::Clef, tick); + Segment* segment = measure->getSegment(Segment::Type::Clef, 0); segment->add(clef); if (capo > 0) {