diff --git a/include/TrackContainerView.h b/include/TrackContainerView.h index e4a8c0d20..7e9dee437 100644 --- a/include/TrackContainerView.h +++ b/include/TrackContainerView.h @@ -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 diff --git a/src/gui/TrackContainerView.cpp b/src/gui/TrackContainerView.cpp index 5d9d66013..94c72d278 100644 --- a/src/gui/TrackContainerView.cpp +++ b/src/gui/TrackContainerView.cpp @@ -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( 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 ); -} - - -