File gcc6-fix.patch of Package drumstick
Index: utils/testevents/testevents.cpp
===================================================================
--- utils/testevents/testevents.cpp (Revision 316)
+++ utils/testevents/testevents.cpp (Revision 317)
@@ -262,8 +262,8 @@
dumpEvent(new KeyPressEvent(5, 60, 124));
dumpEvent(new ChanPressEvent(6, 111));
dumpEvent(new PitchBendEvent(7, 1234));
- char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
- dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
+ QByteArray sysex = QByteArray::fromHex("f04110421240007f0041f7");
+ dumpEvent(new SysExEvent(sysex));
QString text = "This can be a copyright, song name, instrument, lyric...";
TextEvent te(text, 3);
dumpEvent(new TextEvent(te));
Index: library/file/qwrk.cpp
===================================================================
--- library/file/qwrk.cpp (Revision 316)
+++ library/file/qwrk.cpp (Revision 317)
@@ -1047,8 +1047,8 @@
{
qint16 bank = -1;
qint16 patch = -1;
- qint16 vol = -1;
- qint16 pan = -1;
+ //qint16 vol = -1;
+ //qint16 pan = -1;
qint8 key = -1;
qint8 vel = 0;
quint8 port = 0;
@@ -1061,8 +1061,8 @@
QString name = readString(len);
bank = read16bit();
patch = read16bit();
- vol = read16bit();
- pan = read16bit();
+ /*vol =*/ read16bit();
+ /*pan =*/ read16bit();
key = readByte();
vel = readByte();
readGap(7);
Index: library/file/qove.cpp
===================================================================
--- library/file/qove.cpp (Revision 316)
+++ library/file/qove.cpp (Revision 317)
@@ -11356,7 +11356,7 @@
OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);
QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);
- if (k == 0 || (k > 0 && abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
+ if (k == 0 || (k > 0 && std::abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
int tick = d->mtt.getTick(k, 0);
int tempo = (int) measure->getTypeTempo();
tempos[tick] = tempo;
@@ -11739,7 +11739,7 @@
}
case OVE::Articulation_Arpeggio: {
//if( art->getChangeSoundEffect() ) {
- unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
+ unsigned int soundEffect = std::abs(art->getSoundEffect().first) + std::abs(art->getSoundEffect().second);
int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
startTick -= tickAmount;
//}