diff --git a/include/note_play_handle.h b/include/note_play_handle.h index e1374276a..859498b69 100644 --- a/include/note_play_handle.h +++ b/include/note_play_handle.h @@ -53,7 +53,7 @@ public: const f_cnt_t _frames, const note & _n, notePlayHandle * _parent = NULL, const bool _part_of_arp = false, - int midiChannel = -1 ); + int midiEventChannel = -1 ); virtual ~notePlayHandle(); virtual void setVolume( const volume_t volume = DefaultVolume ); diff --git a/src/core/note_play_handle.cpp b/src/core/note_play_handle.cpp index c8845b6f6..c22d2c645 100644 --- a/src/core/note_play_handle.cpp +++ b/src/core/note_play_handle.cpp @@ -50,7 +50,7 @@ notePlayHandle::notePlayHandle( InstrumentTrack * _it, const note & _n, notePlayHandle *parent, const bool _part_of_arp, - int MidiEventChannel ) : + int midiEventChannel ) : playHandle( NotePlayHandle, _offset ), note( _n.length(), _n.pos(), _n.key(), _n.getVolume(), _n.getPanning(), _n.detuning() ), @@ -76,7 +76,7 @@ notePlayHandle::notePlayHandle( InstrumentTrack * _it, m_unpitchedFrequency( 0 ), m_baseDetuning( NULL ), m_songGlobalParentOffset( 0 ), - m_midiChannel( MidiEventChannel >= 0 ? MidiEventChannel : instrumentTrack()->midiPort()->realOutputChannel() ) + m_midiChannel( midiEventChannel >= 0 ? midiEventChannel : instrumentTrack()->midiPort()->realOutputChannel() ) { if( isTopNote() ) {