ardour/livetrax
13
0
Fork 0
Code

Compilation fix.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/midi@1430 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2007-02-07 15:19:34 +00:00
parent f9f5ec85fb
commit eb270e70a1
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/midi++2/alsa_sequencer_midiport.cc
View File

@ -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;