From 5e409b55751210b0e1e4145f5a44c6e6fdf1d724 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier--IfwAyVwL9S8xJKrdU2QtlAdbjyPl9T@jasp.net>
Date: Sat, 10 Sep 2016 02:47:39 +0000
Subject: [PATCH] Fix sample track playback in BB tracks (#3023)

---
 src/tracks/BBTrack.cpp     |  5 +++--
 src/tracks/SampleTrack.cpp | 34 ++++++++++++++++++++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/tracks/BBTrack.cpp b/src/tracks/BBTrack.cpp
index 1e254b4ab..fab6425f3 100644
--- a/src/tracks/BBTrack.cpp
+++ b/src/tracks/BBTrack.cpp
@@ -426,8 +426,9 @@ BBTrack::BBTrack( TrackContainer* tc ) :
 BBTrack::~BBTrack()
 {
 	Engine::mixer()->removePlayHandlesOfTypes( this,
-				PlayHandle::TypeNotePlayHandle
-				| PlayHandle::TypeInstrumentPlayHandle );
+					PlayHandle::TypeNotePlayHandle
+					| PlayHandle::TypeInstrumentPlayHandle
+					| PlayHandle::TypeSamplePlayHandle );
 
 	const int bb = s_infoMap[this];
 	Engine::getBBTrackContainer()->removeBB( bb );
diff --git a/src/tracks/SampleTrack.cpp b/src/tracks/SampleTrack.cpp
index 6f3356ab3..3416c6521 100644
--- a/src/tracks/SampleTrack.cpp
+++ b/src/tracks/SampleTrack.cpp
@@ -39,6 +39,7 @@
 #include "Engine.h"
 #include "ToolTip.h"
 #include "AudioPort.h"
+#include "BBTrack.h"
 #include "SamplePlayHandle.h"
 #include "SampleRecordHandle.h"
 #include "StringPairDrag.h"
@@ -475,19 +476,37 @@ SampleTrack::~SampleTrack()
 
 
 bool SampleTrack::play( const MidiTime & _start, const fpp_t _frames,
-						const f_cnt_t _offset, int /*_tco_num*/ )
+					const f_cnt_t _offset, int _tco_num )
 {
 	m_audioPort.effects()->startRunning();
 	bool played_a_note = false;	// will be return variable
 
-	for( int i = 0; i < numOfTCOs(); ++i )
+	tcoVector tcos;
+	::BBTrack * bb_track = NULL;
+	if( _tco_num >= 0 )
 	{
-		TrackContentObject * tco = getTCO( i );
-		if( tco->startPosition() != _start )
+		if( _start != 0 )
 		{
-			continue;
+			return false;
 		}
-		SampleTCO * st = dynamic_cast<SampleTCO *>( tco );
+		tcos.push_back( getTCO( _tco_num ) );
+		bb_track = BBTrack::findBBTrack( _tco_num );
+	}
+	else
+	{
+		for( int i = 0; i < numOfTCOs(); ++i )
+		{
+			TrackContentObject * tco = getTCO( i );
+			if( tco->startPosition() == _start )
+			{
+				tcos.push_back( tco );
+			}
+		}
+	}
+
+	for( tcoVector::Iterator it = tcos.begin(); it != tcos.end(); ++it )
+	{
+		SampleTCO * st = dynamic_cast<SampleTCO *>( *it );
 		if( !st->isMuted() )
 		{
 			PlayHandle* handle;
@@ -504,10 +523,9 @@ bool SampleTrack::play( const MidiTime & _start, const fpp_t _frames,
 			{
 				SamplePlayHandle* smpHandle = new SamplePlayHandle( st );
 				smpHandle->setVolumeModel( &m_volumeModel );
+				smpHandle->setBBTrack( bb_track );
 				handle = smpHandle;
 			}
-//TODO: check whether this works
-//			handle->setBBTrack( _tco_num );
 			handle->setOffset( _offset );
 			// send it to the mixer
 			Engine::mixer()->addPlayHandle( handle );