Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sampletrack playes in any position in BB, too #4441

Draft
wants to merge 9 commits into
base: master
Choose a base branch
from
Draft

Sampletrack playes in any position in BB, too #4441

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
12fe579
Sampletrack playes in any position in BB, too
BaraMGB Jun 20, 2018
3e9a607
stop playing sample at end of BB TCO
BaraMGB Jun 22, 2018
48af686
fixing bugs/ cleanup code/ add comments
BaraMGB Jun 25, 2018
82c00bd
remove some #includes I used
BaraMGB Jun 25, 2018
3265d3e
overlapping BBTCOs
BaraMGB Oct 19, 2018
ad4f4ec
take care of muted BBTCOs
BaraMGB Oct 19, 2018
9d5afd3
repeat playing when end of BB-Container is reached
BaraMGB Oct 20, 2018
feb837a
calculate end point of looped BB TCOs
BaraMGB Oct 21, 2018
35aad38
take care of changing BB-Track TCO
BaraMGB Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stop playing sample at end of BB TCO
  • Loading branch information
@BaraMGB
BaraMGB committed Jun 22, 2018
commit 3e9a607636a27f5414570ce12e14e84214257094
24 changes: 21 additions & 3 deletions src/tracks/SampleTrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
#include "Mixer.h"
#include "EffectRackView.h"
#include "TrackLabelButton.h"

#include <QDebug>
#include "BBTrackContainer.h"
SampleTCO::SampleTCO( Track * _track ) :
TrackContentObject( _track ),
m_sampleBuffer( new SampleBuffer ),
Expand Down Expand Up @@ -579,25 +580,42 @@ bool SampleTrack::play( const MidiTime & _start, const fpp_t _frames,
bool played_a_note = false; // will be return variable

tcoVector tcos;
//Are we playing in a BBTrack?
::BBTrack * bb_track = NULL;
MidiTime bbEndPos = 0;
if( _tco_num >= 0 )
{
if (trackContainer() == (TrackContainer*)Engine::getBBTrackContainer())
{
bb_track = BBTrack::findBBTrack( _tco_num );
TrackContentObject *bbtco = bb_track->getTCO(_tco_num);
if( Engine::getSong()->playMode() != Song::Mode_PlayBB )
{
bbEndPos = bbtco->endPosition();
}
}
}


for( int i = 0; i < numOfTCOs(); ++i )
{
TrackContentObject * tco = getTCO( i );
SampleTCO * sTco = dynamic_cast<SampleTCO*>( tco );
float framesPerTick = Engine::framesPerTick();
if( _start >= sTco->startPosition() && _start < sTco->endPosition() )
MidiTime TcoEndposition = sTco->endPosition();
//if we play a BBTCO but not from the BBEditor,
//we set the endposition to the end of the BBTCO in the SongEditor
if(bbEndPos > 0)
{
TrackContentObject *bbtco = bb_track->getTCO(_tco_num);
TcoEndposition = bbEndPos - bbtco->startPosition();
}
if( _start >= sTco->startPosition() && _start < TcoEndposition )
{
if( sTco->isPlaying() == false )
{
f_cnt_t sampleStart = framesPerTick * ( _start - sTco->startPosition() );
f_cnt_t tcoFrameLength = framesPerTick * ( sTco->endPosition() - sTco->startPosition() );
f_cnt_t tcoFrameLength = framesPerTick * ( TcoEndposition - sTco->startPosition() );
f_cnt_t sampleBufferLength = sTco->sampleBuffer()->frames();
//if the Tco smaller than the sample length we play only until Tco end
//else we play the sample to the end but nothing more
Expand Down