mirror/lmms
1
0 Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-10-24 07:38:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gui_application' into ed_refac

Browse Source 
Conflicts:
	src/core/Song.cpp
	src/gui/MainWindow.cpp
This commit is contained in:
Lukas W committed 2015-01-07 00:03:32 +01:00
2 parents 0c4833ca4a 0df3998f95
commit 748cccd266
48 files changed
+436 -345
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/tracks/SampleTrack.cpp
+2 -1
View File
@@ -44,6 +44,7 @@
#include "StringPairDrag.h"
#include "Knob.h"
#include "MainWindow.h"
#include "GuiApplication.h"
#include "EffectRackView.h"
#include "TrackLabelButton.h"
#include "ConfigManager.h"
@@ -567,7 +568,7 @@ SampleTrackView::SampleTrackView( SampleTrack * _t, TrackContainerView* tcv ) :
m_effectRack = new EffectRackView( _t->audioPort()->effects() );
m_effectRack->setFixedSize( 240, 242 );
m_effWindow = Engine::mainWindow()->workspace()->addSubWindow( m_effectRack );
m_effWindow = gui->mainWindow()->workspace()->addSubWindow( m_effectRack );
m_effWindow->setAttribute( Qt::WA_DeleteOnClose, false );
m_effWindow->layout()->setSizeConstraint( QLayout::SetFixedSize );
m_effWindow->setWindowTitle( _t->name() );