diff options
| author | Michele Calgaro <[email protected]> | 2021-07-27 23:31:01 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2021-07-27 23:37:42 +0900 |
| commit | a690b16f6e8daa7c0d3ee6a331364f2f1ec397d1 (patch) | |
| tree | ee24bdf69cb40efc22a6599d7572b3c3a10e9f1e /src/sound | |
| parent | 56820f71711ade48de78be09e9502a02f0e73648 (diff) | |
| download | rosegarden-a690b16f6e8daa7c0d3ee6a331364f2f1ec397d1.tar.gz rosegarden-a690b16f6e8daa7c0d3ee6a331364f2f1ec397d1.zip | |
Fixed FTBFS with clang.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'src/sound')
| -rw-r--r-- | src/sound/AlsaDriver.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sound/AlsaDriver.cpp b/src/sound/AlsaDriver.cpp index de42960..ad61892 100644 --- a/src/sound/AlsaDriver.cpp +++ b/src/sound/AlsaDriver.cpp @@ -2068,7 +2068,7 @@ AlsaDriver::resetPlayback(const RealTime &oldPosition, const RealTime &position) unsigned char locateDataArr[7] = { 0x06, 0x01, - 0x60 + t_hrs, // (30fps flag) + hh + (unsigned char)(0x60 + t_hrs), // (30fps flag) + hh t_min, // mm t_sec, // ss t_frm, // frames @@ -2339,8 +2339,8 @@ AlsaDriver::processNotesOff(const RealTime &time, bool now, bool everything) bool scheduled = (offTime > alsaTime) && !now; if (!scheduled) offTime = RealTime::zeroTime; - snd_seq_real_time_t alsaOffTime = { offTime.sec, - offTime.nsec }; + snd_seq_real_time_t alsaOffTime = { (unsigned int)offTime.sec, + (unsigned int)offTime.nsec }; snd_seq_ev_set_noteoff(&event, ev->getChannel(), @@ -3032,7 +3032,7 @@ AlsaDriver::insertMTCFullFrame(RealTime time) m_mtcFrames = (unsigned)m_mtcEncodedTime.nsec / 40000000U; time = time + m_alsaPlayStartTime - m_playStartPosition; - snd_seq_real_time_t atime = { time.sec, time.nsec }; + snd_seq_real_time_t atime = { (unsigned int)time.sec, (unsigned int)time.nsec }; unsigned char data[10] = { MIDI_SYSTEM_EXCLUSIVE, @@ -3137,7 +3137,7 @@ AlsaDriver::insertMTCTQFrames(RealTime sliceStart, RealTime sliceEnd) } RealTime scheduleTime = t + m_alsaPlayStartTime - m_playStartPosition; - snd_seq_real_time_t atime = { scheduleTime.sec, scheduleTime.nsec }; + snd_seq_real_time_t atime = { (unsigned int)scheduleTime.sec, (unsigned int)scheduleTime.nsec }; event.type = SND_SEQ_EVENT_QFRAME; event.data.control.value = c; @@ -3500,7 +3500,7 @@ AlsaDriver::processMidiOut(const MappedComposition &mC, // Second and nanoseconds for ALSA // - snd_seq_real_time_t time = { outputTime.sec, outputTime.nsec }; + snd_seq_real_time_t time = { (unsigned int)outputTime.sec, (unsigned int)outputTime.nsec }; if (!isSoftSynth) { @@ -5198,7 +5198,7 @@ AlsaDriver::sendSystemQueued(MidiByte command, snd_seq_ev_set_source(&event, m_syncOutputPort); snd_seq_ev_set_subs(&event); - snd_seq_real_time_t sendTime = { time.sec, time.nsec }; + snd_seq_real_time_t sendTime = { (unsigned int)time.sec, (unsigned int)time.nsec }; // Schedule the command // |