Attachment #434734 for bug #583512

View | Details | Raw Unified | Return to bug 583512
Collapse All | Expand All

Lines 11356-11362 Link Here

(-)library/file/qove.cpp (-2 / +2 lines)
11356	OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);	11356	OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);
11357	QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);	11357	QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);
11358		11358
11359	if (k == 0 \|\| (k > 0 && abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {	11359	if (k == 0 \|\| (k > 0 && std::abs(measure->getTypeTempo() - d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
11360	int tick = d->mtt.getTick(k, 0);	11360	int tick = d->mtt.getTick(k, 0);
11361	int tempo = (int) measure->getTypeTempo();	11361	int tempo = (int) measure->getTypeTempo();
11362	tempos[tick] = tempo;	11362	tempos[tick] = tempo;
Lines 11739-11745 Link Here
11739	}	11739	}
11740	case OVE::Articulation_Arpeggio: {	11740	case OVE::Articulation_Arpeggio: {
11741	//if( art->getChangeSoundEffect() ) {	11741	//if( art->getChangeSoundEffect() ) {
11742	unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);	11742	unsigned int soundEffect = std::abs(art->getSoundEffect().first) + std::abs(art->getSoundEffect().second);
11743	int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);	11743	int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
11744	startTick -= tickAmount;	11744	startTick -= tickAmount;
11745	//}	11745	//}

Lines 262-268 Link Here

(-)utils/testevents/testevents.cpp (-1 / +1 lines)
262	dumpEvent(new KeyPressEvent(5, 60, 124));	262	dumpEvent(new KeyPressEvent(5, 60, 124));
263	dumpEvent(new ChanPressEvent(6, 111));	263	dumpEvent(new ChanPressEvent(6, 111));
264	dumpEvent(new PitchBendEvent(7, 1234));	264	dumpEvent(new PitchBendEvent(7, 1234));
265	char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};	265	char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0', '\x7f', '\0', '\x41', '\xf7'};
266	dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));	266	dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
267	QString text = "This can be a copyright, song name, instrument, lyric...";	267	QString text = "This can be a copyright, song name, instrument, lyric...";
268	TextEvent te(text, 3);	268	TextEvent te(text, 3);

Return to bug 583512