Skip to content

Commit b94d642

Browse files
committed
fix code style
1 parent 063154d commit b94d642

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

src/importexport/mei/internal/meiconverter.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2967,7 +2967,7 @@ engraving::TremoloType Convert::unitdurFromMEI(const libmei::FTrem& meiFTrem, bo
29672967
case (libmei::DURATION_64): return engraving::TremoloType::C64;
29682968
default:
29692969
warning = true;
2970-
return (engraving::TremoloType::INVALID_TREMOLO);
2970+
return engraving::TremoloType::INVALID_TREMOLO
29712971
}
29722972
}
29732973

@@ -2981,10 +2981,14 @@ libmei::data_DURATION Convert::unitdurToMEI(const engraving::TremoloTwoChord* tr
29812981
unitdur = dur - libmei::DURATION_4;
29822982
}
29832983
switch (tremolo->tremoloType()) {
2984-
case (engraving::TremoloType::C8): unitdur += libmei::DURATION_8; break;
2985-
case (engraving::TremoloType::C16): unitdur += libmei::DURATION_16; break;
2986-
case (engraving::TremoloType::C32): unitdur += libmei::DURATION_32; break;
2987-
case (engraving::TremoloType::C64): unitdur += libmei::DURATION_64; break;
2984+
case (engraving::TremoloType::C8): unitdur += libmei::DURATION_8;
2985+
break;
2986+
case (engraving::TremoloType::C16): unitdur += libmei::DURATION_16;
2987+
break;
2988+
case (engraving::TremoloType::C32): unitdur += libmei::DURATION_32;
2989+
break;
2990+
case (engraving::TremoloType::C64): unitdur += libmei::DURATION_64;
2991+
break;
29882992
default:
29892993
unitdur = libmei::DURATION_NONE;
29902994
}

src/importexport/mei/internal/meiimporter.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,9 @@ ChordRest* MeiImporter::addChordRest(pugi::xml_node node, Measure* measure, int
263263
TDuration duration;
264264
duration.setType(Convert::durFromMEI(durationLogAtt->GetDur(), warning));
265265
if (node.select_node("ancestor::fTrem")) {
266-
duration.setType(Convert::durFromMEI(static_cast<libmei::data_DURATION>(durationLogAtt->GetDur() + libmei::DURATION_breve), warning)); // fTrem is a tremolo, so we increase the duration type
266+
// fTrem is a tremolo, so we increase the duration type
267+
duration.setType(Convert::durFromMEI(static_cast<libmei::data_DURATION>(durationLogAtt->GetDur()
268+
+ libmei::DURATION_breve), warning));
267269
}
268270
if (warning) {
269271
this->addLog("duration", node);

0 commit comments

Comments
 (0)