hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

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

Browse Source 
Remove the need of ControllerConnection::finalizeConnections
when not loading projects.
Fix ZynAddSubFX knob disconnection when exporting.
This commit is contained in:
Hyunjin Song
2018-08-01 14:35:16 +09:00
committed by GitHub
parent b268abba45
commit e07f9a3b64
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/LadspaEffect/LadspaEffect.cpp
View File

@@ -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();
}

2
plugins/zynaddsubfx/ZynAddSubFx.cpp
View File

@@ -645,8 +645,6 @@ void ZynAddSubFxView::toggleUI()
connect( model->m_remotePlugin, SIGNAL( clickedCloseButton() ),
m_toggleUIButton, SLOT( toggle() ) );
}
ControllerConnection::finalizeConnections();
}
}

18
src/core/ControllerConnection.cpp
View File

@@ -204,16 +204,22 @@ void ControllerConnection::loadSettings( const QDomElement & _this )
}
else
{
if( _this.attribute( "id", "-1" ).toInt() >= 0 )
{
m_controllerId = _this.attribute( "id" ).toInt();
}
else
m_controllerId = _this.attribute( "id", "-1" ).toInt();
if( m_controllerId < 0 )
{
qWarning( "controller index invalid\n" );
m_controllerId = -1;
}
m_controller = Controller::create( Controller::DummyController, NULL );
if (!Engine::getSong()->isLoadingProject() && m_controllerId != -1)
{
setController( Engine::getSong()->
controllers().at( m_controllerId ) );
}
else
{
m_controller = Controller::create( Controller::DummyController, NULL );
}
}
}