Let sample tracks play from any song position #3133

BaraMGB · 2016-11-26T10:40:40Z

Okay, let's test this. I hope I found a solution that works for all.

Umcaruje · 2016-11-26T11:58:31Z

So I did some testing:

It works really nice when I jump the playhead around and there's low CPU usage

Bugs:

When resizing the windows the CPU usage goes really high
CPU usage also goes high when you have a lot of sample tracks and you zoom in or out
When scrolling and resizing windows there are very noticeable clicks in the audio
The sync breaks when the playhead mode is set to anything other than to go back to the beginning after stopping ( )
It seems that when you actually resize the sample track so it's bigger than it's normal size, the part with no sample plays random parts of previous samples, or even stuff I previewed beforehand. I'll try to make a video later today.

Umcaruje · 2016-11-26T19:10:19Z

Here's a video of the weird behaviour: https://youtu.be/Hh9at-DF7hI

BaraMGB · 2016-11-29T12:29:27Z

Click noises on resize and scrolling Song Editor should be fixed now.

softrabbit · 2016-11-29T21:09:30Z

How well does this cope with time signature and/or tempo automation?

BaraMGB · 2016-11-29T23:36:17Z

How well does this cope with time signature and/or tempo automation?

Sorry, thats not implemented yet. Please let's do the things step by step.

BaraMGB · 2016-12-11T15:07:38Z

@Umcaruje the fourth point should be fixed now. You can now looping, change songposition per mouse and per left/right key. mute and unmute the track, solo and unsolo an other track, stop pause playing and all that stuff. It will be synced perfectly ( I hope 😄 )

zonkmachine · 2016-12-11T15:55:20Z

Bloody amazing!

tresf · 2016-12-15T01:11:34Z

@BaraMGB I'm still getting some pretty bad artifacts if the sample is extended past its length... (white noise, clicks)

BaraMGB · 2016-12-15T10:41:56Z

My plan is to limit the TCO length to sample length. I think this is the simplest way to avoid this.

BaraMGB · 2016-12-15T14:25:54Z

@tresf okay, I guess I fixed it. Can you test this again?

tresf · 2016-12-16T16:24:00Z

artifacts if the sample is extended past its length

[fixed] Can you test this again?

Confirmed, the artifacts are gone.

Umcaruje · 2016-12-16T17:36:09Z

Do any artifacts occur when you add an empty tco, without any sample loaded?

tresf · 2016-12-16T17:46:56Z

Do any artifacts occur when you add an empty tco, without any sample loaded?

None.

Umcaruje · 2016-12-16T17:49:51Z

Awesome 👍

tresf · 2016-12-16T17:55:38Z

@Umcaruje @BaraMGB @softrabbit I think this is ready to merge. I understand time signature will break this however we have many bugs today with time signature and seeking ahead. I want this in 1.2.0-RC2 so that we get solid usage and feedback on it.

Umcaruje · 2016-12-16T17:58:07Z

The drawing sequence needs to be simplified so it won't produce such high cpu usage on redraws, though I guess that could be an issue for a seperate PR. I'm going to do some more thorough testing now.

Umcaruje · 2016-12-16T18:23:04Z

Ok so I found a problem: when you change the time signature to something other than 4/4 visually the sample view breaks. The track seems to sync up properly to the new time signature, but it's off from the drawn waveform. And on 3/4 time signature when you add a blank element it looks like this:

And it should be 1 measure long as usual

BaraMGB · 2016-12-17T16:09:43Z

Oh boy, that time signature stuff drives me crazy. I hope my thoughts about that and the resulting calculations are correct. Please test this out. @tresf @Umcaruje

tresf · 2016-12-17T16:23:36Z

👍

zonkmachine · 2016-12-17T16:55:42Z

Works mighty well. Is it screaming hard to have this work in the Beat/Bassline Sample Track too?

zapashcanon · 2016-12-17T17:49:25Z

src/tracks/SampleTrack.cpp

+			{
+				if( sTco->isPlaying() == false )
+				{
+					f_cnt_t sampleStart = ( _start * framesPerTick ) - ( sTco->startPosition() * framesPerTick );


f_cnt_t sampleStart = framesPerTick * ( _start - sTco->startPosition() );

zapashcanon · 2016-12-17T17:50:24Z

src/tracks/SampleTrack.cpp

+				if( sTco->isPlaying() == false )
+				{
+					f_cnt_t sampleStart = ( _start * framesPerTick ) - ( sTco->startPosition() * framesPerTick );
+					f_cnt_t tcoFrameLength = ( sTco->endPosition() * framesPerTick ) - ( sTco->startPosition() * framesPerTick );


f_cnt_t tcoFrameLength = framesPerTick * ( sTco->endPosition() - sTco->startPosition() );

zapashcanon · 2016-12-17T17:51:21Z

src/tracks/SampleTrack.cpp

@@ -394,10 +454,12 @@ void SampleTCOView::paintEvent( QPaintEvent * pe )
 					/ (float) m_tco->length().getTact() :
 								pixelsPerTact();

+	float nom = Engine::getSong()->getTimeSigModel().getNumerator();
+	float den = Engine::getSong()->getTimeSigModel().getDenominator();
+	float ticksPerTact = DefaultTicksPerTact * ( nom / den );


float ticksPerTact = DefaultTicksPerTact * nom / den;

zonkmachine · 2016-12-17T17:56:47Z

clicktrack.zip Edit: re-uploaded with correct samples...

OK. I made a test project with two different length click tracks and they sync perfectly. However, every now and then the samples will cut out after the first click on one and sometimes both sides. I haven't seen this on export.

zonkmachine · 2017-01-01T23:23:18Z

if the loop goes back to start the first tick is not played

Also, the glitchy tick on loop back, is that the first tick of the next bar before a loop? So the whole audio track is one tick off... but instrument tracks isn't?

zapashcanon · 2017-01-01T23:52:17Z

src/tracks/SampleTrack.cpp

-					f_cnt_t sampleStart = ( _start * framesPerTick ) - ( sTco->startPosition() * framesPerTick );
-					f_cnt_t tcoFrameLength = ( sTco->endPosition() * framesPerTick ) - ( sTco->startPosition() * framesPerTick );
+					f_cnt_t sampleStart = framesPerTick * ( _start - sTco->startPosition() );
+					f_cnt_t tcoFrameLength = framesPerTick * ( sTco->endPosition() - 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
 					f_cnt_t samplePlayLength = tcoFrameLength > sampleBufferLength ? sampleBufferLength : tcoFrameLength;
 					//we only play within the sampleBuffer limits
 					if( sampleStart < sTco->sampleBuffer()->frames() )


if( sampleStart < sampleBufferLength )

Thank you, sometimes I'm a little bit blind. ;)

BaraMGB · 2017-01-02T16:30:03Z

@zonkmachine ~~the next problem is, this seems to be a timing issue. On my big computer (i7) the loop seems perfect.~~ So on different computers it appears different.

edit: there's something fishy, but I don't see it. 😩

BaraMGB · 2017-01-05T14:41:11Z

@zonkmachine : perhaps this is a stupid idea:
https://github.com/BaraMGB/lmms/blob/sampletrack/src/core/Song.cpp#L341-L344
Here the loopback position emits the signal one tick earlier. Your clicktrack seem okay now. But may be the sampletrack is cut off at the end now ( one tick ) I can't hear and test it. For me it sounds okay.

zapashcanon · 2017-01-05T15:38:04Z

src/core/Song.cpp

+				if( m_playPos[m_playMode] == tl->loopEnd() - 1 )
+				{
+					emit updateSampleTracks();
+				}
 				if( m_playPos[m_playMode] >= tl->loopEnd() )
 				{
 					m_playPos[m_playMode].setTicks( tl->loopBegin().getTicks() );

 					m_elapsedMilliSeconds = 
 						( ( tl->loopBegin().getTicks() ) * 60 * 1000 / 48 ) / 


m_elapsedMilliSeconds = tl->loopBegin().getTicks() * 1250 / getTempo();

And the same thing on lines 269, 326, 409, 574 and 643.

No. This will make it harder to deduce where 1250 came from in the first place. The compiler does operations on real numbers for us.

I don't want to change code I don't have to touch. I want to have this PR as clean as possible. We can make an extra PR with code cleaning stuff.

zapashcanon · 2017-01-05T15:42:29Z

src/core/Song.cpp

+				if( m_playPos[m_playMode] == tl->loopEnd() - 1 )
+				{
+					emit updateSampleTracks();
+				}
 				if( m_playPos[m_playMode] >= tl->loopEnd() )


else if( m_playPos[m_playMode] >= tl->loopEnd() )

I would also switch them, as the second one is likely to be true more often.

This is a great idea. I've changed this.

I think you should just try and move the whole loop one tick earlier. (in if( checkLoop ) )

if( m_playPos[m_playMode] >= tl->loopEnd() ) { m_playPos[m_playMode].setTicks( tl->loopBegin().getTicks() );

to something like (pseudocodeish...):

if( m_playPos[m_playMode] >= tl->loopEnd().getTicks() - 1 ) { m_playPos[m_playMode].setTicks( tl->loopBegin().getTicks() - 1 );

Umcaruje · 2017-01-05T20:05:28Z

src/tracks/SampleTrack.cpp

@@ -298,7 +311,7 @@ void SampleTCOView::updateSample()
 	// sample-tco contains
 	ToolTip::add( this, ( m_tco->m_sampleBuffer->audioFile() != "" ) ?
 					m_tco->m_sampleBuffer->audioFile() :
-					tr( "double-click to select sample" ) );
+					  tr( "double-click to select sample" ) );


2 spaces added on accident

Umcaruje · 2017-01-05T20:51:30Z

Ok so we went over this PR on Discord and both @BaraMGB and @zonkmachine agree on a merge. I'm going to merge this once Travis is done buidling, and we can make an RC2 🎉

There are a few quirks in the GUI drawing and also one minor bug when looping, and that can be adressed later.

* play sampletracks from any song position * take care of TCO length * TCOs shouldn't be updated when SE window is resized * take care of zooming level * takes care on all song position changes and mute/solo tracks now * playes the sample only within the buffer limits * takes care of time signature changes * some minor code improvements (zapashcanon) * loopback one tick earlier * minor code changes * get rid off clicks by resize and scrolling song editor * removes playhandle by remove TCO * minor bugs on manipulating TCOs in Song Editor * update on add sample by playing * white spaces 1

zonkmachine · 2017-01-17T20:06:13Z

@zonkmachine : perhaps this is a stupid idea:
https://github.com/BaraMGB/lmms/blob/sampletrack/src/core/Song.cpp#L341-L344
Here the loopback position emits the signal one tick earlier. Your clicktrack seem okay now. But may be the sampletrack is cut off at the end now ( one tick ) I can't hear and test it. For me it sounds okay.

The glitches are still there but not as prominent. I'm looking into it.

zonkmachine · 2017-01-24T04:58:57Z

So on different computers it appears different.

Apparently libsndfile corrected some buffer overflow error in 1.0.26 and I'm on 1.0.25 so this could be related.

* play sampletracks from any song position * take care of TCO length * TCOs shouldn't be updated when SE window is resized * take care of zooming level * takes care on all song position changes and mute/solo tracks now * playes the sample only within the buffer limits * takes care of time signature changes * some minor code improvements (zapashcanon) * loopback one tick earlier * minor code changes * get rid off clicks by resize and scrolling song editor * removes playhandle by remove TCO * minor bugs on manipulating TCOs in Song Editor * update on add sample by playing * white spaces 1

BaraMGB added 2 commits November 26, 2016 11:04

play sampletracks from any song position

025a8b4

take care of TCO length

849f063

BaraMGB added 2 commits November 29, 2016 11:37

TCOs shouldn't be updated when SE window is resized

a313ee7

take care of zooming level

6ce7fed

takes care on all song position changes and mute/solo tracks now

df89f67

BaraMGB added the in progress label Dec 12, 2016

playes the sample only within the buffer limits

1250eab

takes care of time signature changes

ae6c1ea

zapashcanon reviewed Dec 17, 2016

View reviewed changes

zapashcanon reviewed Jan 1, 2017

View reviewed changes

loopback one tick earlier

b04f8b8

zapashcanon suggested changes Jan 5, 2017

View reviewed changes

minor code changes

daf14a4

BaraMGB force-pushed the sampletrack branch from 403e916 to daf14a4 Compare January 5, 2017 17:06

BaraMGB added 3 commits January 5, 2017 19:27

get rid off clicks by resize and scrolling song editor

5205f53

removes playhandle by remove TCO

80db907

minor bugs on manipulating TCOs in Song Editor

bdc5c51

Umcaruje reviewed Jan 5, 2017

View reviewed changes

update on add sample by playing

461a0e1

Umcaruje changed the title ~~lets Sampletrack play from any song position~~ Let sample tracks play from any song position Jan 5, 2017

Umcaruje removed the in progress label Jan 5, 2017

white spaces 1

869890f

Umcaruje merged commit 43a77a0 into LMMS:master Jan 5, 2017

tresf mentioned this pull request Feb 22, 2017

Better Sample Track support #1471

Open

29 tasks

tresf mentioned this pull request Apr 3, 2017

Play Sample Track Mid-Song #131

Closed

PhysSong mentioned this pull request May 30, 2017

fixes sample muting bug for sampletrack #3591

Merged

PhysSong mentioned this pull request May 9, 2018

Enable sample track recording #3947

Closed

16 tasks

PhysSong mentioned this pull request May 19, 2018

Exporting a sample track cuts off the beginning #4362

Closed

PhysSong mentioned this pull request Jun 12, 2018

Playing Sample Track inside BB Track does not always work #4422

Open

PhysSong mentioned this pull request Oct 15, 2018

Fix minor sample track playback/export glitches #4666

Merged

Let sample tracks play from any song position #3133

Let sample tracks play from any song position #3133

Conversation

BaraMGB commented Nov 26, 2016

Umcaruje commented Nov 26, 2016 • edited Loading

Umcaruje commented Nov 26, 2016

BaraMGB commented Nov 29, 2016

softrabbit commented Nov 29, 2016

BaraMGB commented Nov 29, 2016

BaraMGB commented Dec 11, 2016

zonkmachine commented Dec 11, 2016

tresf commented Dec 15, 2016

BaraMGB commented Dec 15, 2016

BaraMGB commented Dec 15, 2016

tresf commented Dec 16, 2016

Umcaruje commented Dec 16, 2016

tresf commented Dec 16, 2016

Umcaruje commented Dec 16, 2016

tresf commented Dec 16, 2016

Umcaruje commented Dec 16, 2016

Umcaruje commented Dec 16, 2016

BaraMGB commented Dec 17, 2016

tresf commented Dec 17, 2016

zonkmachine commented Dec 17, 2016 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zonkmachine commented Dec 17, 2016 • edited Loading

zonkmachine commented Jan 1, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

BaraMGB commented Jan 2, 2017 • edited Loading

BaraMGB commented Jan 5, 2017

zapashcanon Jan 5, 2017 • edited by zonkmachine Loading

Choose a reason for hiding this comment

zapashcanon Jan 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zonkmachine Jan 5, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Umcaruje commented Jan 5, 2017

zonkmachine commented Jan 17, 2017

zonkmachine commented Jan 24, 2017

Umcaruje commented Nov 26, 2016 •

edited

Loading

zonkmachine commented Dec 17, 2016 •

edited

Loading

zonkmachine commented Dec 17, 2016 •

edited

Loading

BaraMGB commented Jan 2, 2017 •

edited

Loading

zapashcanon Jan 5, 2017 •

edited by zonkmachine

Loading

zapashcanon Jan 5, 2017 •

edited

Loading

zonkmachine Jan 5, 2017 •

edited

Loading