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/portaudio | |
| 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/portaudio')
4 files changed, 5 insertions, 5 deletions
diff --git a/libs/backends/portaudio/winmmemidi_input_device.cc b/libs/backends/portaudio/winmmemidi_input_device.cc index 4e0e84f468..010f19122b 100644 --- a/libs/backends/portaudio/winmmemidi_input_device.cc +++ b/libs/backends/portaudio/winmmemidi_input_device.cc @@ -37,7 +37,7 @@ namespace ARDOUR { WinMMEMidiInputDevice::WinMMEMidiInputDevice (int index) : m_handle(0) , m_started(false) - , m_midi_buffer(new RingBuffer<uint8_t>(MIDI_BUFFER_SIZE)) + , m_midi_buffer(new PBD::RingBuffer<uint8_t>(MIDI_BUFFER_SIZE)) , m_sysex_buffer(new uint8_t[SYSEX_BUFFER_SIZE]) { DEBUG_MIDI (string_compose ("Creating midi input device index: %1\n", index)); @@ -315,7 +315,7 @@ WinMMEMidiInputDevice::dequeue_midi_event (uint64_t timestamp_start, return false; } - RingBuffer<uint8_t>::rw_vector vector; + PBD::RingBuffer<uint8_t>::rw_vector vector; m_midi_buffer->get_read_vector (&vector); if (vector.len[0] >= sizeof(MidiEventHeader)) { memcpy ((uint8_t*)&h, vector.buf[0], sizeof(MidiEventHeader)); diff --git a/libs/backends/portaudio/winmmemidi_input_device.h b/libs/backends/portaudio/winmmemidi_input_device.h index b1a7fb6b88..97dd3d6a59 100644 --- a/libs/backends/portaudio/winmmemidi_input_device.h +++ b/libs/backends/portaudio/winmmemidi_input_device.h @@ -95,7 +95,7 @@ private: // data std::string m_name; // can't use unique_ptr yet - boost::scoped_ptr<RingBuffer<uint8_t> > m_midi_buffer; + boost::scoped_ptr<PBD::RingBuffer<uint8_t> > m_midi_buffer; boost::scoped_array<uint8_t> m_sysex_buffer; }; diff --git a/libs/backends/portaudio/winmmemidi_output_device.cc b/libs/backends/portaudio/winmmemidi_output_device.cc index 72b1494ac5..8acf3d7135 100644 --- a/libs/backends/portaudio/winmmemidi_output_device.cc +++ b/libs/backends/portaudio/winmmemidi_output_device.cc @@ -45,7 +45,7 @@ WinMMEMidiOutputDevice::WinMMEMidiOutputDevice (int index) , m_enabled(false) , m_thread_running(false) , m_thread_quit(false) - , m_midi_buffer(new RingBuffer<uint8_t>(MIDI_BUFFER_SIZE)) + , m_midi_buffer(new PBD::RingBuffer<uint8_t>(MIDI_BUFFER_SIZE)) { DEBUG_MIDI (string_compose ("Creating midi output device index: %1\n", index)); diff --git a/libs/backends/portaudio/winmmemidi_output_device.h b/libs/backends/portaudio/winmmemidi_output_device.h index bc3a6251ae..b10b52a677 100644 --- a/libs/backends/portaudio/winmmemidi_output_device.h +++ b/libs/backends/portaudio/winmmemidi_output_device.h @@ -98,7 +98,7 @@ private: // Data bool m_thread_running; bool m_thread_quit; - boost::scoped_ptr<RingBuffer<uint8_t> > m_midi_buffer; + boost::scoped_ptr<PBD::RingBuffer<uint8_t> > m_midi_buffer; }; } // namespace ARDOUR |