Skip to content

Fix for LFO Controller desync on changing play position with the mouse. #8081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix for LFO Controller desync on changing play position with the mouse. #8081

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24fee79
Fix for LFO Controller desync on changing play position with the mouse.
Jan125 Oct 8, 2025
8e57977
Formatting and compiling fixes
Jan125 Oct 10, 2025
b66dbda
Replace setToTime, edit setPlayPos, remove unused code
Jan125 Oct 11, 2025
1362b8a
Revert nonexplicit Song::PlayMode::None for TimeLine Playhead moving.
Jan125 Oct 11, 2025
58230e7
Merge branch 'LMMS:master' into lfocontrollermouseplayheadmovefix
Jan125 Oct 25, 2025
a7f5d19
Merge branch 'LMMS:master' into lfocontrollermouseplayheadmovefix
Jan125 Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/Song.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,8 @@ private slots:

void updateFramesPerTick();


public:
void setPlayPos( tick_t ticks, PlayMode playMode );

private:
Song();
Expand All @@ -434,7 +435,6 @@ private slots:
getPlayPos(m_playMode).currentFrame();
}

void setPlayPos( tick_t ticks, PlayMode playMode );

void saveControllerStates( QDomDocument & doc, QDomElement & element );
void restoreControllerStates( const QDomElement & element );
Expand Down
18 changes: 18 additions & 0 deletions src/gui/editors/TimeLineWidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,24 @@ void TimeLineWidget::mouseMoveEvent( QMouseEvent* event )
switch( m_action )
{
case Action::MovePositionMarker:
// Using both setToTime and setPlayPos are required in this context.
// setToTime sets the time display at the top.
// setPlayPos updated the LFO Controller and probably other stuff as well.
m_pos.setTicks(timeAtCursor.getTicks());
if (!( Engine::getSong()->isPlaying()))
{
//Song::PlayMode::None is used when nothing is being played.
Engine::getSong()->setToTime(timeAtCursor, Song::PlayMode::None);
Engine::getSong()->setPlayPos(timeAtCursor.getTicks(), Song::PlayMode::None);
} else {
Engine::getSong()->setToTime(timeAtCursor, m_mode);
Engine::getSong()->setPlayPos(timeAtCursor.getTicks(), m_mode);
}
m_pos.setCurrentFrame( 0 );
m_pos.setJumped( true );
updatePosition();
break;

m_pos.setTicks(timeAtCursor.getTicks());
Engine::getSong()->setToTime(timeAtCursor, m_mode);
if (!( Engine::getSong()->isPlaying()))
Expand Down