Drop sample on sampletracks

include/TrackContainerView.h

@@ -32,6 +32,7 @@
 #include <QThread>
 
 #include "Track.h"
+#include "SampleTrack.h"
 #include "JournallingObject.h"
 #include "InstrumentTrack.h"
 
@@ -152,6 +153,7 @@ public slots:
 	virtual void resizeEvent( QResizeEvent * );
 
 	MidiTime m_currentPosition;
+	int m_timeLineWidgetHeigth;
 
 
 private:
@@ -176,6 +178,7 @@ public slots:
 	} ;
 	friend class TrackContainerView::scrollArea;
 
+	void addSampleTCO(Track * track, QString sampleFile, int xPos);
 	TrackContainer* m_tc;
 	typedef QList<TrackView *> trackViewList;
 	trackViewList m_trackViews;

src/gui/TrackContainerView.cpp

@@ -51,6 +51,7 @@ TrackContainerView::TrackContainerView( TrackContainer * _tc ) :
 	JournallingObject(),
 	SerializingObjectHook(),
 	m_currentPosition( 0, 0 ),
+	m_timeLineWidgetHeigth(0),
 	m_tc( _tc ),
 	m_trackViews(),
 	m_scrollArea( new scrollArea( this ) ),
@@ -377,9 +378,10 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
 		//it->toggledInstrumentTrackButton( true );
 		_de->accept();
 	}
-	else if( type == "samplefile" || type == "pluginpresetfile" 
-		|| type == "soundfontfile" || type == "vstpluginfile"
-		|| type == "patchfile" )
+	else if(type == "pluginpresetfile"
+		 || type == "soundfontfile"
+		 || type == "vstpluginfile"
+		 || type == "patchfile")
 	{
 		InstrumentTrack * it = dynamic_cast<InstrumentTrack *>(
 				Track::create( Track::InstrumentTrack,
@@ -391,6 +393,28 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
 		//it->toggledInstrumentTrackButton( true );
 		_de->accept();
 	}
+	else if(type == "samplefile")
+	{
+		const TrackView * trackView = trackViewAt(_de->pos().y() - m_timeLineWidgetHeigth);
+		if (trackView && trackView->getTrack()->type() == Track::SampleTrack)
+		{
+			for (auto tv : trackViews())
+			{
+				if (tv == trackView)
+				{
+					addSampleTCO(tv->getTrack(), value, _de->pos().x());
+				}
+			}
+		}
+		else
+		{
+			Track * track = Track::create(Track::SampleTrack, m_tc);
+			if (track)
+			{
+				addSampleTCO(track, value, _de->pos().x());
+			}
+		}
+	}
 	else if( type == "presetfile" )
 	{
 		DataFile dataFile( value );
@@ -474,6 +498,26 @@ void TrackContainerView::resizeEvent( QResizeEvent * _re )
 	QWidget::resizeEvent( _re );
 }
 
+
+
+
+void TrackContainerView::addSampleTCO(Track *track, QString sampleFile, int xPos)
+{
+		int trackHeadWidth = ConfigManager::inst()->value("ui", "compacttrackbuttons").toInt()==1
+								 ? DEFAULT_SETTINGS_WIDGET_WIDTH_COMPACT + TRACK_OP_WIDTH_COMPACT
+								 : DEFAULT_SETTINGS_WIDGET_WIDTH + TRACK_OP_WIDTH;
+		SampleTCO * newTco = new SampleTCO(track);
+		newTco->setSampleFile(sampleFile);
+		newTco->movePosition(fixedTCOs() == false
+							 ? MidiTime((xPos - trackHeadWidth) / pixelsPerTact()
+										* MidiTime::ticksPerTact()).toNearestTact()
+							 : MidiTime(0)
+							   );
+}
+
+
+
+
 RubberBand *TrackContainerView::rubberBand() const
 {
     return m_rubberBand;

src/gui/editors/SongEditor.cpp

@@ -555,6 +555,7 @@ static inline void animateScroll( QScrollBar *scrollBar, int newVal, bool smooth
 
 void SongEditor::updatePosition( const MidiTime & t )
 {
+	m_timeLineWidgetHeigth = m_timeLine->height();
 	int widgetWidth, trackOpWidth;
 	if( ConfigManager::inst()->value( "ui", "compacttrackbuttons" ).toInt() )
 	{