diff options
| author | David Robillard <d@drobilla.net> | 2007-02-07 15:19:34 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-02-07 15:19:34 +0000 |
| commit | eb270e70a12c410cdd98585ad25bb6d8e384a4f5 (patch) | |
| tree | f35ba15f10491c7003369d02d4c9c17e23b8e5ea /libs | |
| parent | f9f5ec85fbfd15d0008f70d4185a84eeadfd3891 (diff) | |
Compilation fix.
git-svn-id: svn://localhost/ardour2/branches/midi@1430 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/midi++2/alsa_sequencer_midiport.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libs/midi++2/alsa_sequencer_midiport.cc b/libs/midi++2/alsa_sequencer_midiport.cc index c748bbece0..bf891108c6 100644 --- a/libs/midi++2/alsa_sequencer_midiport.cc +++ b/libs/midi++2/alsa_sequencer_midiport.cc @@ -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; |