Skip to content

Commit 25b42c5

Browse files
committed
restored qt5.15 compatibility
By using quint64 instead if std::uint64_t
1 parent b6e37a1 commit 25b42c5

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

seqplayer.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ SequencePlayer::SequencePlayer()
101101
{
102102
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
103103
qRegisterMetaType<std::chrono::milliseconds>();
104-
qRegisterMetaType<std::uint64_t>();
105104
#endif
106105
initChannels();
107106
}
@@ -280,7 +279,7 @@ void SequencePlayer::playerLoop()
280279
using TimePoint = Clock::time_point;
281280
static const std::type_info &beatId = typeid(BeatEvent);
282281
int currentBar{0};
283-
std::uint64_t echoTicks{0};
282+
quint64 echoTicks{0};
284283
microseconds deltaTime{microseconds::zero()}, echoDelta{m_echoResolution};
285284
TimePoint currentTime{Clock::now()}, nextTime{currentTime}, nextEcho{currentTime},
286285
startTime{currentTime};
@@ -430,7 +429,7 @@ void SequencePlayer::resetPosition()
430429
}
431430
}
432431

433-
void SequencePlayer::setPosition(uint64_t ticks)
432+
void SequencePlayer::setPosition(quint64 ticks)
434433
{
435434
//qDebug() << Q_FUNC_INFO << pos;
436435
allNotesOff();

seqplayer.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
3030
Q_DECLARE_METATYPE(std::chrono::milliseconds)
31-
Q_DECLARE_METATYPE(std::uint64_t)
3231
#endif
3332

3433
class SequencePlayer : public QObject
@@ -56,7 +55,7 @@ class SequencePlayer : public QObject
5655
int getPitchShift();
5756
int getVolumeFactor();
5857
void resetPosition();
59-
void setPosition(std::uint64_t ticks);
58+
void setPosition(quint64 ticks);
6059
void setPitchShift(unsigned int pitch);
6160
void setVolumeFactor(unsigned int vol);
6261
void allNotesOff();
@@ -90,7 +89,7 @@ public slots:
9089
void songStarted();
9190
void songFinished();
9291
void songStopped();
93-
void songEchoTime(std::chrono::milliseconds millis, std::uint64_t ticks);
92+
void songEchoTime(std::chrono::milliseconds millis, quint64 ticks);
9493
void volumeChanged(int channel, qreal newVolume);
9594
void mutedChanged(int channel, bool);
9695
void lockedChanged(int channel, bool);
@@ -123,8 +122,8 @@ private slots:
123122

124123
Sequence m_song;
125124
drumstick::rt::MIDIOutput* m_port;
126-
std::uint64_t m_songPositionTicks;
127-
std::uint64_t m_echoResolution;
125+
quint64 m_songPositionTicks;
126+
quint64 m_echoResolution;
128127
bool m_loopEnabled;
129128
int m_loopStart;
130129
int m_loopEnd;

0 commit comments

Comments
 (0)