Skip to content

Midi sustain working when envelope is on #3730

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

Merged
zonkmachine merged 3 commits into from
Aug 2, 2017
Merged

Midi sustain working when envelope is on #3730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd7fa77
midi sustain working when envelope is on
serdnab Jul 26, 2017
df5271d
pressing sustain pedal again doesn't pause release
serdnab Jul 30, 2017
eb0ca34
format changes
serdnab Aug 2, 2017
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
6 changes: 6 additions & 0 deletions include/NotePlayHandle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@ class EXPORT NotePlayHandle : public PlayHandle, public Note
return m_released;
}

bool isReleaseStarted() const
{
return m_releaseStarted;
}

/*! Returns total numbers of frames played so far */
f_cnt_t totalFramesPlayed() const
{
Expand Down Expand Up @@ -297,6 +302,7 @@ class EXPORT NotePlayHandle : public PlayHandle, public Note
// release of note
NotePlayHandleList m_subNotes; // used for chords and arpeggios
volatile bool m_released; // indicates whether note is released
bool m_releaseStarted;
bool m_hasParent; // indicates whether note has parent
NotePlayHandle * m_parent; // parent note
bool m_hadChildren;
Expand Down
3 changes: 2 additions & 1 deletion src/core/InstrumentSoundShaping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ void InstrumentSoundShaping::processAudioBuffer( sampleFrame* buffer,
const f_cnt_t envTotalFrames = n->totalFramesPlayed();
f_cnt_t envReleaseBegin = envTotalFrames - n->releaseFramesDone() + n->framesBeforeRelease();

if( n->isReleased() == false )
if( !n->isReleased() || ( n->instrumentTrack()->isSustainPedalPressed() &&
!n->isReleaseStarted() ) )
{
envReleaseBegin += frames;
}
Expand Down
6 changes: 5 additions & 1 deletion src/core/NotePlayHandle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ NotePlayHandle::NotePlayHandle( InstrumentTrack* instrumentTrack,
m_releaseFramesDone( 0 ),
m_subNotes(),
m_released( false ),
m_releaseStarted( false ),
m_hasParent( parent != NULL ),
m_parent( parent ),
m_hadChildren( false ),
Expand Down Expand Up @@ -248,8 +249,11 @@ void NotePlayHandle::play( sampleFrame * _working_buffer )
m_instrumentTrack->playNote( this, _working_buffer );
}

if( m_released )
if( m_released && (!instrumentTrack()->isSustainPedalPressed() ||
m_releaseStarted) )
{
m_releaseStarted = true;

f_cnt_t todo = framesThisPeriod;

// if this note is base-note for arpeggio, always set
Expand Down