Compilation fix.
git-svn-id: svn://localhost/ardour2/branches/midi@1430 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
f9f5ec85fb
commit
eb270e70a1
@ -133,12 +133,7 @@ int ALSA_SequencerMidiPort::write (byte *msg, size_t msglen, timestamp_t timesta
|
||||
return totwritten;
|
||||
}
|
||||
|
||||
<<<<<<< .working
|
||||
int ALSA_SequencerMidiPort::read (byte *buf, size_t max, timestamp_t timestamp)
|
||||
=======
|
||||
int
|
||||
ALSA_SequencerMidiPort::read (byte *buf, size_t max)
|
||||
>>>>>>> .merge-right.r1393
|
||||
{
|
||||
TR_FN();
|
||||
int err;
|
||||
|
Loading…
Reference in New Issue
Block a user