Skip to content

Fix lost control links in copied automation patterns #4723

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

Merged
PhysSong merged 2 commits into from
Dec 22, 2018
+16 −0
Merged

Fix lost control links in copied automation patterns #4723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7832124
Fix lost control links in copied automation patterns
PhysSong Dec 9, 2018
993a15c
Don't expose EO_ID_MSD
PhysSong Dec 21, 2018
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
1 change: 1 addition & 0 deletions include/ProjectJournal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ class ProjectJournal
}

static jo_id_t idToSave( jo_id_t id );
static jo_id_t idFromSave( jo_id_t id );

void clearJournal();
void stopAllJournalling();
Expand Down
10 changes: 10 additions & 0 deletions src/core/AutomationPattern.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,16 @@ void AutomationPattern::resolveAllIDs()
{
a->addObject( dynamic_cast<AutomatableModel *>( o ), false );
}
else
{
// FIXME: Remove this block once the automation system gets fixed
// This is a temporary fix for https://github.com/LMMS/lmms/issues/3781
o = Engine::projectJournal()->journallingObject(ProjectJournal::idFromSave(*k));
if( o && dynamic_cast<AutomatableModel *>( o ) )
{
a->addObject( dynamic_cast<AutomatableModel *>( o ), false );
}
}
}
a->m_idsToResolve.clear();
a->dataChanged();
Expand Down
5 changes: 5 additions & 0 deletions src/core/ProjectJournal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,11 @@ jo_id_t ProjectJournal::idToSave( jo_id_t id )
return id & ~EO_ID_MSB;
}

jo_id_t ProjectJournal::idFromSave( jo_id_t id )
{
return id | EO_ID_MSB;
}




Expand Down