Skip to content

Don't use dummy controllers for connections if not loading projects #4493

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 1 commit into from
Aug 1, 2018
+11 −10
Merged

Don't use dummy controllers for connections if not loading projects #4493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions plugins/LadspaEffect/LadspaEffect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ void LadspaEffect::changeSampleRate()
// the IDs of re-created controls have been saved and now need to be
// resolved again
AutomationPattern::resolveAllIDs();

// make sure, connections are ok
ControllerConnection::finalizeConnections();
}


Expand Down
2 changes: 0 additions & 2 deletions plugins/zynaddsubfx/ZynAddSubFx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,6 @@ void ZynAddSubFxView::toggleUI()
connect( model->m_remotePlugin, SIGNAL( clickedCloseButton() ),
m_toggleUIButton, SLOT( toggle() ) );
}

ControllerConnection::finalizeConnections();
}
}

Expand Down
16 changes: 11 additions & 5 deletions src/core/ControllerConnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,16 +204,22 @@ void ControllerConnection::loadSettings( const QDomElement & _this )
}
else
{
if( _this.attribute( "id", "-1" ).toInt() >= 0 )
m_controllerId = _this.attribute( "id", "-1" ).toInt();
if( m_controllerId < 0 )
{
m_controllerId = _this.attribute( "id" ).toInt();
qWarning( "controller index invalid\n" );
m_controllerId = -1;
}

if (!Engine::getSong()->isLoadingProject() && m_controllerId != -1)
{
setController( Engine::getSong()->
controllers().at( m_controllerId ) );
}
else
{
qWarning( "controller index invalid\n" );
m_controllerId = -1;
m_controller = Controller::create( Controller::DummyController, NULL );
}
m_controller = Controller::create( Controller::DummyController, NULL );
}
}

Expand Down