split off effectControlDialog into effectControlDialog and effectControls, made work with M/V as well as rewritten effect-framework, fixed bug in songEditor-engine
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/branches/lmms-mv@664 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
1 parent
add39dffbd
commit
382d7d44b0
17 files changed
+381
-207
No files matched your search
@@ -35,6 +35,7 @@
|
||||
|
||||
#include "audio_port.h"
|
||||
#include "caption_menu.h"
|
||||
#include "effect_controls.h"
|
||||
#include "effect_control_dialog.h"
|
||||
#include "embed.h"
|
||||
#include "engine.h"
|
||||
@@ -112,7 +113,7 @@ effectView::effectView( effect * _model, QWidget * _parent ) :
|
||||
bg.toImage().copy( 5, 44, 195, 10 ) ) );
|
||||
m_label->setPalette( pal );
|
||||
|
||||
m_controlView = getEffect()->createControlDialog( NULL );
|
||||
m_controlView = getEffect()->getControls()->createView();
|
||||
m_subWindow = engine::getMainWindow()->workspace()->addSubWindow(
|
||||
m_controlView );
|
||||
connect( m_controlView, SIGNAL( closed() ),
|
||||
@@ -120,7 +121,7 @@ effectView::effectView( effect * _model, QWidget * _parent ) :
|
||||
|
||||
m_subWindow->hide();
|
||||
|
||||
if( m_controlView->getControlCount() == 0 )
|
||||
if( getEffect()->getControls()->getControlCount() == 0 )
|
||||
{
|
||||
m_editButton->hide();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user