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

made LADSPA-plugin-layouter work again after Qt4-port, other small code-fixes

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@667 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Tobias Doerffel
2008-01-18 12:21:33 +00:00
parent 0d012353f0
commit 1808379915
8 changed files with 68 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
plugins/ladspa_effect/ladspa_control_dialog.cpp
View File

@@ -41,13 +41,14 @@ ladspaControlDialog::ladspaControlDialog( ladspaControls * _ctl ) :
QHBoxLayout * effectLay = new QHBoxLayout();
mainLay->addLayout( effectLay );
int rows = static_cast<int>( sqrt(
static_cast<double>( _ctl->m_controlCount ) ) );
const int cols = static_cast<int>( sqrt(
static_cast<double>( _ctl->m_controlCount /
_ctl->m_processors ) ) );
for( ch_cnt_t proc = 0; proc < _ctl->m_processors; proc++ )
{
control_list_t & controls = _ctl->m_controls[proc];
int row_cnt = 0;
int row = 0;
int col = 0;
buffer_data_t last_port = NONE;
QGroupBox * grouper;
@@ -61,6 +62,9 @@ ladspaControlDialog::ladspaControlDialog( ladspaControls * _ctl ) :
{
grouper = new QGroupBox( this );
}
QGridLayout * gl = new QGridLayout( grouper );
grouper->setLayout( gl );
grouper->setAlignment( Qt::Vertical );
for( control_list_t::iterator it = controls.begin();
@@ -68,28 +72,23 @@ ladspaControlDialog::ladspaControlDialog( ladspaControls * _ctl ) :
{
if( (*it)->getPort()->proc == proc )
{
if( last_port == NONE ||
(*it)->getPort()->data_type != TOGGLED ||
( (*it)->getPort()->data_type == TOGGLED &&
last_port == TOGGLED ) )
if( last_port != NONE &&
(*it)->getPort()->data_type ==
TOGGLED &&
!( (*it)->getPort()->data_type ==
TOGGLED &&
last_port == TOGGLED ) )
{
new ladspaControlView( grouper, *it );
++row;
col = 0;
}
else
gl->addWidget( new ladspaControlView(
grouper, *it ),
row, col );
if( ++col == cols )
{
while( row_cnt < rows )
{
new QWidget( grouper );
row_cnt++;
}
new ladspaControlView( grouper, *it );
row_cnt = 0;
}
row_cnt++;
if( row_cnt == ( rows - 1 ) )
{
row_cnt = 0;
++row;
col = 0;
}
last_port = (*it)->getPort()->data_type;
}

8
plugins/ladspa_effect/ladspa_controls.cpp
View File

@@ -43,10 +43,10 @@ ladspaControls::ladspaControls( ladspaEffect * _eff,
for( ch_cnt_t proc = 0; proc < m_processors; proc++ )
{
control_list_t p;
bool linked_control = ( m_processors > 1 && proc == 0 );
const bool linked_control = ( m_processors > 1 && proc == 0 );
buffer_data_t last_port = NONE;
for( multi_proc_t::iterator it = controls.begin();
it != controls.end(); it++ )
{
@@ -69,7 +69,7 @@ ladspaControls::ladspaControls( ladspaEffect * _eff,
}
}
}
m_controls.append( p );
}
}