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

Merge pull request #1550 from LMMS/revert-1519-i1352

Browse Source 
Revert "Proposed fix for 1352  Ifreeze when adding instruments or moving...
This commit is contained in:
Vesa V
2015-01-04 18:49:15 +02:00
parent 9a98adaaed 1bb6fa072f
commit e5c4df372e
2 changed files with 1 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/TrackContainerView.h
View File

@@ -33,7 +33,6 @@
#include "Track.h"
#include "JournallingObject.h"
#include "InstrumentTrack.h"
class QVBoxLayout;
@@ -183,23 +182,6 @@ signals:
} ;
class InstrumentLoaderThread : public QThread
{
Q_OBJECT
public:
InstrumentLoaderThread( QObject *parent = 0 , InstrumentTrack *it = 0, QString name = "" );
void run();
private:
InstrumentTrack *m_it;
QString m_name;
};
#endif

19
src/gui/TrackContainerView.cpp
View File

@@ -47,9 +47,6 @@
#include "Track.h"
TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
QWidget(),
ModelView( NULL, this ),
@@ -328,8 +325,7 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
Track::create( Track::InstrumentTrack,
m_tc ) );
InstrumentLoaderThread *ilt = new InstrumentLoaderThread( this, it, value);
ilt->start();
it->loadInstrument( value );
//it->toggledInstrumentTrackButton( true );
_de->accept();
}
@@ -454,19 +450,6 @@ void TrackContainerView::scrollArea::wheelEvent( QWheelEvent * _we )
}
}
InstrumentLoaderThread::InstrumentLoaderThread( QObject *parent, InstrumentTrack *it, QString name) : QThread( parent )
{
m_it = it;
m_name = name;
}
void InstrumentLoaderThread::run()
{
m_it->loadInstrument( m_name );
}