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

turn enum CondType into enum class

Browse source
This commit is contained in:
Joachim Schmitz 2014-06-30 16:03:28 +02:00
parent 6e4aefacb1
commit f2e5093e91
2 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
mscore/ove.cpp
View file

@ -4438,55 +4438,55 @@ bool BarsParse::parseCond(Measure* measure, MeasureData* measureData, SizeChunk*
if( !getCondElementType(thisByte, type) ) { return false; }
switch (type) {
case Cond_Bar_Number: {
case CondType::Bar_Number: {
if (!parseBarNumber(measure, twoByte - 1)) {
return false;
}
break;
}
case Cond_Repeat: {
case CondType::Repeat: {
if (!parseRepeatSymbol(measureData, oldBlockSize)) {
return false;
}
break;
}
case Cond_Numeric_Ending: {
case CondType::Numeric_Ending: {
if (!parseNumericEndings(measureData, oldBlockSize)) {
return false;
}
break;
}
case Cond_Decorator: {
case CondType::Decorator: {
if (!parseDecorators(measureData, newBlockSize)) {
return false;
}
break;
}
case Cond_Tempo: {
case CondType::Tempo: {
if (!parseTempo(measureData, newBlockSize)) {
return false;
}
break;
}
case Cond_Text: {
case CondType::Text: {
if (!parseText(measureData, newBlockSize)) {
return false;
}
break;
}
case Cond_Expression: {
case CondType::Expression: {
if (!parseExpressions(measureData, newBlockSize)) {
return false;
}
break;
}
case Cond_Time_Parameters: {
case CondType::Time_Parameters: {
if (!parseTimeSignatureParameters(measure, newBlockSize)) {
return false;
}
break;
}
case Cond_Barline_Parameters: {
case CondType::Barline_Parameters: {
if (!parseBarlineParameters(measure, newBlockSize)) {
return false;
}
@ -6928,23 +6928,23 @@ bool BarsParse::parseOffsetElement(OffsetElement* ptr) {
bool BarsParse::getCondElementType(unsigned int byteData, CondType& type) {
if( byteData == 0x09 ) {
type = Cond_Time_Parameters;
type = CondType::Time_Parameters;
} else if (byteData == 0x0A) {
type = Cond_Bar_Number;
type = CondType::Bar_Number;
} else if (byteData == 0x16) {
type = Cond_Decorator;
type = CondType::Decorator;
} else if (byteData == 0x1C) {
type = Cond_Tempo;
type = CondType::Tempo;
} else if (byteData == 0x1D) {
type = Cond_Text;
type = CondType::Text;
} else if (byteData == 0x25) {
type = Cond_Expression;
type = CondType::Expression;
} else if (byteData == 0x30) {
type = Cond_Barline_Parameters;
type = CondType::Barline_Parameters;
} else if (byteData == 0x31) {
type = Cond_Repeat;
type = CondType::Repeat;
} else if (byteData == 0x32) {
type = Cond_Numeric_Ending;
type = CondType::Numeric_Ending;
} else {
return false;
}

23
mscore/ove.h
View file

@ -82,18 +82,17 @@ const int TWELVE_TONE = 12 ;
const int INVALID_NOTE = -1 ;
const int OCTAVE = 7 ;
enum CondType {
Cond_Time_Parameters = 0x09, // size - 7, TimeSignature
Cond_Bar_Number = 0x0A, // size, compatible with previous version
Cond_Decorator = 0x16,
Cond_Tempo = 0x1C, // size - 7
Cond_Text = 0x1D, // size - 7, Rehearsal | SystemText
Cond_Expression = 0x25, // size - 7, if set playback parameters in Expression, will store in COND
Cond_Barline_Parameters = 0x30, // size - 7, include :|| repeat count
Cond_Repeat = 0x31, //
Cond_Numeric_Ending = 0x32, //
Cond_None
enum class CondType : char {
None,
Time_Parameters = 0x09, // size - 7, TimeSignature
Bar_Number = 0x0A, // size, compatible with previous version
Decorator = 0x16,
Tempo = 0x1C, // size - 7
Text = 0x1D, // size - 7, Rehearsal | SystemText
Expression = 0x25, // size - 7, if set playback parameters in Expression, will store in COND
Barline_Parameters = 0x30, // size - 7, include :|| repeat count
Repeat = 0x31, //
Numeric_Ending = 0x32,
};
enum BdatType {