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

fixed potential over-processing in mixer and ladspa control mis-parenting

Browse Source 
git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@310 0778d3d1-df1d-0410-868b-ea421aaaa00d
This commit is contained in:
Danny McRae
2006-08-11 19:58:14 +00:00
parent 5cb83db4b9
commit cabe1570c3
4 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2006-08-10 Danny McRae <khjklujn/at/users/dot/sourceforge/dot/net>
* src/core/mixer:
got rid of the "more_effect |= ..." nonsense
* src/widgets/effect_label.cpp:
* src/widgets/rack_plugin.cpp:
changed the parenting of the control dialog to main window
instead of NULL
2006-08-11 Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
* configure.in:

2
src/core/mixer.cpp
View File

@@ -285,7 +285,7 @@ const surroundSampleFrame * mixer::renderNextBuffer( void )
it != m_audioPorts.end(); ++it )
{
#ifdef LADSPA_SUPPORT
more_effects |= ( *it )->processEffects();
more_effects = ( *it )->processEffects();
if( ( *it )->m_bufferUsage != audioPort::NONE || more_effects )
#else
if( ( *it )->m_bufferUsage != audioPort::NONE )

3
src/widgets/effect_label.cpp
View File

@@ -33,6 +33,7 @@
#include "embed.h"
#include "gui_templates.h"
#include "rename_dialog.h"
#include "main_window.h"
effectLabel::effectLabel( const QString & _initial_name, QWidget * _parent, engine * _engine, sampleTrack * _track ) :
@@ -51,7 +52,7 @@ effectLabel::effectLabel( const QString & _initial_name, QWidget * _parent, engi
m_label->setFont( pointSize<8>( f ) );
m_label->setGeometry( 38, 1, 200, 28 );
m_effWidget = new effectTabWidget( NULL, m_track, m_track->getAudioPort() );
m_effWidget = new effectTabWidget( eng()->getMainWindow()->workspace(), m_track, m_track->getAudioPort() );
m_effWidget->setFixedSize( 240, 242 );
m_effWidget->hide();
connect( m_effWidget, SIGNAL( closed() ), this, SLOT( closeEffects() ) );

3
src/widgets/rack_plugin.cpp
View File

@@ -60,6 +60,7 @@
#include "ladspa_control_dialog.h"
#include "embed.h"
#include "gui_templates.h"
#include "main_window.h"
rackPlugin::rackPlugin( QWidget * _parent, ladspa_key_t _key, track * _track, engine * _engine, audioPort * _port ) :
@@ -157,7 +158,7 @@ rackPlugin::rackPlugin( QWidget * _parent, ladspa_key_t _key, track * _track, en
m_label->setFont( pointSize<7>( f ) );
m_label->setGeometry( 5, 38, 200, 20 );
m_controlView = new ladspaControlDialog( NULL, m_effect, eng(), m_track );
m_controlView = new ladspaControlDialog( eng()->getMainWindow()->workspace(), m_effect, eng(), m_track );
connect( m_controlView, SIGNAL( closed() ), this, SLOT( closeEffects() ) );
m_controlView->hide();