Skip to content

Commit

Permalink
Cleaning up again
Browse files Browse the repository at this point in the history
  • Loading branch information
regulus79 committed Dec 11, 2024
1 parent 840d991 commit 3032b04
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions include/Song.h
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@ class LMMS_EXPORT Song : public TrackContainer
return m_playMode;
}

inline const PlayPos getPlayPos( PlayMode pm ) const
inline const PlayPos & getPlayPos( PlayMode pm ) const
{
return getTimeline(pm).getPlayPos();
}
inline const PlayPos getPlayPos() const
inline const PlayPos & getPlayPos() const
{
return getPlayPos(m_playMode);
}
Expand Down
2 changes: 1 addition & 1 deletion include/Timeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class Timeline : public QObject, public JournallingObject
{
return m_pos;
}
inline void setPlayPos(PlayPos pos) const
inline void setPlayPos(PlayPos pos)
{
m_pos = pos;
emit positionChanged(m_pos);
Expand Down
5 changes: 2 additions & 3 deletions src/gui/editors/PianoRoll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,7 @@ PianoRoll::PianoRoll() :
m_currentPosition, Song::PlayMode::MidiClip, this
);
connect(this, &PianoRoll::positionChanged, m_timeLine->timeline(), &Timeline::updatePosition);
connect(m_timeLine->timeline(), SIGNAL(positionChanged( const lmms::TimePos&)),
this, SLOT(updatePosition(const lmms::TimePos&)));
connect(m_timeLine->timeline(), &Timeline::positionChanged, this, &PianoRoll::updatePosition);

// white position line follows timeline marker
m_positionLine = new PositionLine(this);
Expand Down Expand Up @@ -4540,7 +4539,7 @@ void PianoRoll::updatePositionAccompany( const TimePos & t )
}
if( (int) pos > 0 )
{
s->getTimeline( Song::PlayMode::MidiClip ).setTicks( pos );
s->getTimeline(Song::PlayMode::MidiClip).setTicks(pos);
autoScroll( pos );
}
}
Expand Down

0 comments on commit 3032b04

Please sign in to comment.