Merge pull request #1061 from LMMS/stable-1.1

sync
2014-08-07 11:39:35 +03:00
parent 3bbb81cf24 4a0c78387e
commit dea2631035
2 changed files with 2 additions and 2 deletions
--- a/src/gui/ControllerConnectionDialog.cpp
+++ b/src/gui/ControllerConnectionDialog.cpp
@@ -63,7 +63,7 @@ public:
 	}


-	virtual void processInEvent( const MidiEvent& event, const MidiTime& time )
+	virtual void processInEvent( const MidiEvent& event, const MidiTime& time, f_cnt_t offset = 0 )
 	{
 		if( event.type() == MidiControlChange &&
 			( m_midiPort.inputChannel() == 0 || m_midiPort.inputChannel() == event.channel() + 1 ) )