diff options
| author | Robin Gareus <robin@gareus.org> | 2017-09-16 15:44:48 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-09-16 16:37:29 +0200 |
| commit | 7258c6334db4e8c895fc556ae1ed550f0c70ead1 (patch) | |
| tree | 9a6015bcbef3036b674f70a2d5a5cb817bb2a524 /libs/backends/coreaudio | |
| parent | ae0dcdc0c5d13483271065c360e378202d20170a (diff) | |
Namespace PBD::RingBuffer
class RingBuffer<> is a very generic name and should not pollute the
global namespace.
Diffstat (limited to 'libs/backends/coreaudio')
| -rw-r--r-- | libs/backends/coreaudio/coremidi_io.cc | 6 | ||||
| -rw-r--r-- | libs/backends/coreaudio/coremidi_io.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/backends/coreaudio/coremidi_io.cc b/libs/backends/coreaudio/coremidi_io.cc index 04bcaf1e59..7cfe2e0db3 100644 --- a/libs/backends/coreaudio/coremidi_io.cc +++ b/libs/backends/coreaudio/coremidi_io.cc @@ -82,7 +82,7 @@ static void midiInputCallback(const MIDIPacketList *list, void *procRef, void *s #endif return; } - RingBuffer<uint8_t> * rb = static_cast<RingBuffer < uint8_t > *> (srcRef); + PBD::RingBuffer<uint8_t> * rb = static_cast<PBD::RingBuffer < uint8_t > *> (srcRef); if (!rb) { #ifndef NDEBUG if (_debug_mode & 4) { @@ -450,7 +450,7 @@ CoreMidiIo::discover() _input_ports = (MIDIPortRef *) malloc (srcCount * sizeof(MIDIPortRef)); _input_endpoints = (MIDIEndpointRef*) malloc (srcCount * sizeof(MIDIEndpointRef)); _input_queue = (CoreMIDIQueue*) calloc (srcCount, sizeof(CoreMIDIQueue)); - _rb = (RingBuffer<uint8_t> **) malloc (srcCount * sizeof(RingBuffer<uint8_t>*)); + _rb = (PBD::RingBuffer<uint8_t> **) malloc (srcCount * sizeof(PBD::RingBuffer<uint8_t>*)); } if (dstCount > 0) { _output_ports = (MIDIPortRef *) malloc (dstCount * sizeof(MIDIPortRef)); @@ -473,7 +473,7 @@ CoreMidiIo::discover() fprintf(stderr, "Cannot create Midi Output\n"); continue; } - _rb[_n_midi_in] = new RingBuffer<uint8_t>(32768); + _rb[_n_midi_in] = new PBD::RingBuffer<uint8_t>(32768); _input_queue[_n_midi_in] = CoreMIDIQueue(); MIDIPortConnectSource(_input_ports[_n_midi_in], src, (void*) _rb[_n_midi_in]); CFRelease(port_name); diff --git a/libs/backends/coreaudio/coremidi_io.h b/libs/backends/coreaudio/coremidi_io.h index b09261cbf9..18f66cb561 100644 --- a/libs/backends/coreaudio/coremidi_io.h +++ b/libs/backends/coreaudio/coremidi_io.h @@ -104,7 +104,7 @@ private: MIDIPortRef * _output_ports; CoreMIDIQueue * _input_queue; - RingBuffer<uint8_t> ** _rb; + PBD::RingBuffer<uint8_t> ** _rb; uint32_t _n_midi_in; uint32_t _n_midi_out; |