hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Attempt to remove mutex calls from instrumenttrack::processinevent

Browse Source
This commit is contained in:
Vesa
2014-07-09 12:38:09 +03:00
parent d4b0cc126d
commit 4eb486be1e
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/InstrumentTrack.h
View File

@@ -26,6 +26,9 @@
#ifndef INSTRUMENT_TRACK_H
#define INSTRUMENT_TRACK_H
#include <QtCore/QAtomicPointer>
#include <QtCore/QAtomicInt>
#include "AudioPort.h"
#include "InstrumentFunctions.h"
#include "InstrumentSoundShaping.h"
@@ -227,7 +230,7 @@ private:
AudioPort m_audioPort;
MidiPort m_midiPort;
NotePlayHandle* m_notes[NumKeys];
QAtomicPointer<NotePlayHandle> m_notes[NumKeys];
int m_runningMidiNotes[NumKeys];
bool m_sustainPedalPressed;

20
src/tracks/InstrumentTrack.cpp
View File

@@ -264,7 +264,6 @@ MidiEvent InstrumentTrack::applyMasterKey( const MidiEvent& event )
void InstrumentTrack::processInEvent( const MidiEvent& event, const MidiTime& time, f_cnt_t offset )
{
engine::mixer()->lock();
bool eventHandled = false;
switch( event.type() )
@@ -275,20 +274,17 @@ void InstrumentTrack::processInEvent( const MidiEvent& event, const MidiTime& ti
case MidiNoteOn:
if( event.velocity() > 0 )
{
if( m_notes[event.key()] == NULL )
{
// create (timed) note-play-handle
NotePlayHandle* nph = new NotePlayHandle( this, offset,
NotePlayHandle* nph;
m_notes[event.key()].testAndSetOrdered( NULL, ( nph = new NotePlayHandle( this, offset,
typeInfo<f_cnt_t>::max() / 2,
note( MidiTime(), MidiTime(), event.key(), event.volume( midiPort()->baseVelocity() ) ),
NULL, event.channel(),
NotePlayHandle::OriginMidiInput );
if( engine::mixer()->addPlayHandle( nph ) )
{
m_notes[event.key()] = nph;
}
NotePlayHandle::OriginMidiInput ) ) );
if( ! engine::mixer()->addPlayHandle( nph ) )
{
m_notes[event.key()].testAndSetOrdered( nph, NULL );
}
qDebug( "ok" );
eventHandled = true;
break;
}
@@ -369,7 +365,6 @@ void InstrumentTrack::processInEvent( const MidiEvent& event, const MidiTime& ti
qWarning( "InstrumentTrack: unhandled MIDI event %d", event.type() );
}
engine::mixer()->unlock();
}
@@ -393,6 +388,7 @@ void InstrumentTrack::processOutEvent( const MidiEvent& event, const MidiTime& t
if( key >= 0 && key < NumKeys )
{
if( m_runningMidiNotes[key] > 0 )
{
m_instrument->handleMidiEvent( MidiEvent( MidiNoteOff, midiPort()->realOutputChannel(), key, 0 ), time, offset );