Namespace PBD::RingBuffer

class RingBuffer<> is a very generic name and should not pollute the
global namespace.

10 files changed, 14 insertions, 14 deletions

diff --git a/libs/backends/alsa/alsa_midi.cc b/libs/backends/alsa/alsa_midi.cc
index d593f73def..d9d473a84d 100644
--- a/libs/backends/alsa/alsa_midi.cc
+++ b/libs/backends/alsa/alsa_midi.cc
@@ -50,7 +50,7 @@ AlsaMidiIO::AlsaMidiIO ()
 	// worst case here is  8192 SPP and 8KSPS for which we'd need
 	// 4000 bytes sans MidiEventHeader.
 	// since we're not always in sync, let's use 4096.
-	_rb = new RingBuffer<uint8_t>(4096 + 4096 * sizeof(MidiEventHeader));
+	_rb = new PBD::RingBuffer<uint8_t>(4096 + 4096 * sizeof(MidiEventHeader));
 }
 
 AlsaMidiIO::~AlsaMidiIO ()
@@ -178,7 +178,7 @@ AlsaMidiIn::recv_event (pframes_t &time, uint8_t *data, size_t &size)
 		return 0;
 	}
 
-	RingBuffer<uint8_t>::rw_vector vector;
+	PBD::RingBuffer<uint8_t>::rw_vector vector;
 	_rb->get_read_vector(&vector);
 	if (vector.len[0] >= sizeof(MidiEventHeader)) {
 		memcpy((uint8_t*)&h, vector.buf[0], sizeof(MidiEventHeader));
diff --git a/libs/backends/alsa/alsa_midi.h b/libs/backends/alsa/alsa_midi.h
index 7aa2af95c3..d21d4178ab 100644
--- a/libs/backends/alsa/alsa_midi.h
+++ b/libs/backends/alsa/alsa_midi.h
@@ -72,7 +72,7 @@ protected:
 			, size(s) {}
 	};
 
-	RingBuffer<uint8_t>* _rb;
+	PBD::RingBuffer<uint8_t>* _rb;
 
 	std::string _name;
 
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;
diff --git a/libs/backends/dummy/dummy_audiobackend.cc b/libs/backends/dummy/dummy_audiobackend.cc
index 94cd5f440a..9400d03bbe 100644
--- a/libs/backends/dummy/dummy_audiobackend.cc
+++ b/libs/backends/dummy/dummy_audiobackend.cc
@@ -1839,7 +1839,7 @@ DummyAudioPort::setup_generator (GeneratorType const g, float const samplerate,
 			tc.frame = 0;
 			ltc_encoder_set_timecode (_ltc, &tc);
 					name += string_compose ("@%1h", (int)tc.hours);
-			_ltcbuf = new RingBuffer<Sample> (std::max (DummyAudioBackend::max_buffer_size() * 2.f, samplerate));
+			_ltcbuf = new PBD::RingBuffer<Sample> (std::max (DummyAudioBackend::max_buffer_size() * 2.f, samplerate));
 			break;
 		case Loopback:
 			_wavetable = (Sample*) malloc (DummyAudioBackend::max_buffer_size() * sizeof(Sample));
diff --git a/libs/backends/dummy/dummy_audiobackend.h b/libs/backends/dummy/dummy_audiobackend.h
index f009fba59c..739a649407 100644
--- a/libs/backends/dummy/dummy_audiobackend.h
+++ b/libs/backends/dummy/dummy_audiobackend.h
@@ -200,7 +200,7 @@ class DummyAudioPort : public DummyPort {
 		float _rn1;
 		// LTC generator
 		LTCEncoder* _ltc;
-		RingBuffer<Sample>* _ltcbuf;
+		PBD::RingBuffer<Sample>* _ltcbuf;
 		float _ltc_spd;
 		float _ltc_rand;
 
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