diff options
| -rw-r--r-- | src/base/SegmentNotationHelper.h | 2 | ||||
| -rw-r--r-- | src/gui/editors/matrix/MatrixStaff.h | 2 | ||||
| -rw-r--r-- | src/gui/editors/notation/NotationStaff.h | 10 | ||||
| -rw-r--r-- | src/sound/AlsaDriver.cpp | 14 |
4 files changed, 14 insertions, 14 deletions
diff --git a/src/base/SegmentNotationHelper.h b/src/base/SegmentNotationHelper.h index 1804a14..0823ee5 100644 --- a/src/base/SegmentNotationHelper.h +++ b/src/base/SegmentNotationHelper.h @@ -31,7 +31,7 @@ public: SegmentNotationHelper(Segment &t) : SegmentHelper(t) { } virtual ~SegmentNotationHelper(); - SegmentHelper::segment; + using SegmentHelper::segment; /** * Set the NOTE_TYPE and NOTE_DOTS properties on the events diff --git a/src/gui/editors/matrix/MatrixStaff.h b/src/gui/editors/matrix/MatrixStaff.h index 2ce65a8..eec5802 100644 --- a/src/gui/editors/matrix/MatrixStaff.h +++ b/src/gui/editors/matrix/MatrixStaff.h @@ -79,7 +79,7 @@ protected: virtual ViewElement* makeViewElement(Event*); public: - LinedStaff::setResolution; + using LinedStaff::setResolution; // double getTimeScaleFactor() const { return m_scaleFactor * 2; } // TODO: GROSS HACK to enhance matrix resolution (see also in matrixview.cpp) - BREAKS MATRIX VIEW, see bug 1000595 double getTimeScaleFactor() const { return m_scaleFactor; } diff --git a/src/gui/editors/notation/NotationStaff.h b/src/gui/editors/notation/NotationStaff.h index 9660700..758f180 100644 --- a/src/gui/editors/notation/NotationStaff.h +++ b/src/gui/editors/notation/NotationStaff.h @@ -100,11 +100,11 @@ public: m_barNumbersEvery = barNumbersEvery; } - LinedStaff::setPageMode; - LinedStaff::setPageWidth; - LinedStaff::setRowsPerPage; - LinedStaff::setRowSpacing; - LinedStaff::setConnectingLineLength; + using LinedStaff::setPageMode; + using LinedStaff::setPageWidth; + using LinedStaff::setRowsPerPage; + using LinedStaff::setRowSpacing; + using LinedStaff::setConnectingLineLength; /** * Gets a read-only reference to the pixmap factory used by the 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 // |