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

Jump to bottom

same note layering when sustain pedal is pressed #3774

Merged
merged 1 commit into from
Aug 26, 2017
Merged

same note layering when sustain pedal is pressed #3774

merged 1 commit into from
Aug 26, 2017

Conversation

serdnab
Copy link
Contributor

@serdnab serdnab commented Aug 24, 2017

fix for #3757
I moved the signal emission for note ended to where all notes (sustained and not sustained) go, the release process on NotePlayHandle:play

@PhysSong
Copy link
Member

Haven't tested yet, but looks good. I'll test it soon.

@PhysSong
Copy link
Member

Tested. It works great, and I can't find any regressions caused by this.

zonkmachine
zonkmachine requested changes Aug 24, 2017
View reviewed changes
Copy link
Member

@zonkmachine zonkmachine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested summarily. Works like a charm!

src/core/NotePlayHandle.cpp
@@ -252,8 +252,17 @@ void NotePlayHandle::play( sampleFrame * _working_buffer )
if( m_released && (!instrumentTrack()->isSustainPedalPressed() ||
m_releaseStarted) )
{
m_releaseStarted = true;
if (m_releaseStarted == false)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't mix styles. This would be comparably to the rest of your changes in this PR and surrounding code.

if( m_releaseStarted == false )

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (a) is new convention, if( a ) is old one. Many things are written with old convention, which make the code inconsistent for recently edited files.
I suggest using new style in line 252.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. ;)

@serdnab
Copy link
Contributor Author

serdnab commented Aug 25, 2017

So, I have to change something?

@PhysSong
Copy link
Member

It'd be better to either change line 252 and 258 to new style, or use old convention in line 255.

@zonkmachine zonkmachine merged commit e387e77 into LMMS:master Aug 26, 2017
@zonkmachine
Copy link
Member

So, I have to change something?

We had a discussion on this over at the discord developer channel. Since the conventions have changed the code base is inconsistent anyway. Merged. Thanks for fixing this!

@PhysSong PhysSong mentioned this pull request Aug 26, 2017
Closed
zonkmachine pushed a commit that referenced this pull request Aug 26, 2017
@serdnab @zonkmachine
same note layering when sustain pedal is pressed (#3774)
efd0d34 
[cherry-picked from master]
@zonkmachine
Copy link
Member

Backported in efd0d34

@zonkmachine
Copy link
Member

An oops with this PR. Recording single streamed instruments just disappeared...

@serdnab
Copy link
Contributor Author

serdnab commented Aug 28, 2017

An oops with this PR. Recording single streamed instruments just disappeared...

@PhysSong I will use your proposed solution (here #3757 (comment)).
Do you want to code yourself?
If not, I will be glad of doing it myself.

@PhysSong
Copy link
Member

PhysSong commented Aug 28, 2017 •
edited
Loading

I'm going to fix #3777. I'll try to fix this too.
If I say I've failed, please do this @serdnab.
Edit: #3777 is tricky to fix, so fix it if you can.

@serdnab
Copy link
Contributor Author

serdnab commented Aug 29, 2017

I will take a look at #3777,

An oops with this PR. Recording single streamed instruments just disappeared...

and are you on this?

@zonkmachine
Copy link
Member

I will take a look at #3777,

👍

and are you on this?

@PhysSong Is looking at this one. Maybe open a separate issue?

@PhysSong
Copy link
Member

Maybe open a separate issue?

👍 I think so.

@PhysSong
Copy link
Member

PhysSong commented Sep 2, 2017

I tried my suggestion in #3757 (comment). It seems to fix both issues, but it is an incomplete solution for #3777.

@serdnab
Copy link
Contributor Author

serdnab commented Sep 4, 2017

@PhysSong I have a solution for #3777 but I'm waiting your PR because I will use the place where you store the sustained notes.

@PhysSong
Copy link
Member

PhysSong commented Sep 4, 2017

@serdnab What is your solution for #3777?

@serdnab
Copy link
Contributor Author

serdnab commented Sep 6, 2017 •
edited
Loading

@PhysSong

What is your solution for #3777?

Assign an unique ID for every recording instance of Note and then on finishRecordNote() at PianoRoll.cpp compare by that ID.

@PhysSong
Copy link
Member

PhysSong commented Sep 7, 2017

@serdnab That can be a permanent and fundamental solution, if the uniqueness is guaranteed and the ID won't be changed. I'll send a PR for single-stream recording fix.

@serdnab
Copy link
Contributor Author

serdnab commented Sep 9, 2017

The problem is not that instruments are single-stream, it is that they don't have a release.
Some instruments, even if they have envelope off, have an internal release.
Try with Vibed instrument and you will see that when envelope is on it records normally.

@zonkmachine
Copy link
Member

Try with Vibed instrument and you will see that when envelope is on it records normally.

Confirmed. sfxr too.

@zonkmachine zonkmachine mentioned this pull request Sep 9, 2017
Merged
@zonkmachine
Copy link
Member

An oops with this PR. Recording single streamed instruments just disappeared...

@PhysSong Is looking at this one. Maybe open a separate issue?

The problem is not that instruments are single-stream, it is that they don't have a release.
Some instruments, even if they have envelope off, have an internal release.

I don't have time to write up an issue for this right now. RC4?

@PhysSong
Copy link
Member

PhysSong commented Sep 9, 2017

I will open a PR that fixes recording single-stream instruments tomorrow. RC4 is really coming :)

PhysSong added a commit to PhysSong/lmms that referenced this pull request Sep 11, 2017
@PhysSong
Revert "same note layering when sustain pedal is pressed (LMMS#3774)"
18e0808 
This reverts commit e387e77.
@PhysSong PhysSong mentioned this pull request Sep 11, 2017
Merged
PhysSong added a commit to PhysSong/lmms that referenced this pull request Sep 11, 2017
@PhysSong
Revert "same note layering when sustain pedal is pressed (LMMS#3774)"
10f6688 
This reverts commit e387e77.
PhysSong added a commit to PhysSong/lmms that referenced this pull request Sep 18, 2017
@PhysSong
Revert "same note layering when sustain pedal is pressed (LMMS#3774)"
7bb8264 
This reverts commit e387e77.
Umcaruje pushed a commit that referenced this pull request Sep 18, 2017
@PhysSong @Umcaruje
Fix recording of single streamed instruments(regression in #3774) (#3803
4e3c6b0 
)

* Revert "same note layering when sustain pedal is pressed (#3774)"

This reverts commit e387e77.

* Fix recording of sustained notes
@PhysSong PhysSong mentioned this pull request Sep 27, 2017
Closed
gi0e5b06 pushed a commit to gi0e5b06/lmms that referenced this pull request Oct 14, 2017
@PhysSong @gi0e5b06
Revert "same note layering when sustain pedal is pressed (LMMS#3774)"
cf369c4 
This reverts commit e387e77.
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@serdnab @zonkmachine
same note layering when sustain pedal is pressed (LMMS#3774)
ab80176
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@serdnab @zonkmachine
same note layering when sustain pedal is pressed (LMMS#3774)
f16eb7c 
[cherry-picked from master]
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
@PhysSong @Umcaruje
Fix recording of single streamed instruments(regression in LMMS#3774) (…
0bef451 
…LMMS#3803)

* Revert "same note layering when sustain pedal is pressed (LMMS#3774)"

This reverts commit ab80176.

* Fix recording of sustained notes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PhysSong PhysSong PhysSong left review comments

@zonkmachine zonkmachine zonkmachine approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@serdnab @PhysSong @zonkmachine