diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/async_midi_port.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/butler.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/lv2_plugin.h | 14 | ||||
| -rw-r--r-- | libs/ardour/ardour/port_manager.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_event.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/worker.h | 20 |
6 files changed, 22 insertions, 22 deletions
diff --git a/libs/ardour/ardour/async_midi_port.h b/libs/ardour/ardour/async_midi_port.h index 4e578b5ed1..35f3f53e4f 100644 --- a/libs/ardour/ardour/async_midi_port.h +++ b/libs/ardour/ardour/async_midi_port.h @@ -84,7 +84,7 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port { bool _flush_at_cycle_start; bool have_timer; boost::function<framecnt_t (void)> timer; - RingBuffer< Evoral::Event<double> > output_fifo; + PBD::RingBuffer< Evoral::Event<double> > output_fifo; EventRingBuffer<MIDI::timestamp_t> input_fifo; Glib::Threads::Mutex output_fifo_lock; CrossThreadChannel _xthread; diff --git a/libs/ardour/ardour/butler.h b/libs/ardour/ardour/butler.h index 44ce784899..3c254648ff 100644 --- a/libs/ardour/ardour/butler.h +++ b/libs/ardour/ardour/butler.h @@ -85,7 +85,7 @@ class LIBARDOUR_API Butler : public SessionHandleRef framecnt_t audio_dstream_capture_buffer_size; framecnt_t audio_dstream_playback_buffer_size; uint32_t midi_dstream_buffer_size; - RingBuffer<CrossThreadPool*> pool_trash; + PBD::RingBuffer<CrossThreadPool*> pool_trash; private: void empty_pool_trash (); diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h index c3d437b6f7..ee4a17d9a9 100644 --- a/libs/ardour/ardour/lv2_plugin.h +++ b/libs/ardour/ardour/lv2_plugin.h @@ -264,15 +264,15 @@ class LIBARDOUR_API LV2Plugin : public ARDOUR::Plugin, public ARDOUR::Workee uint32_t size, const uint8_t* body); - bool write_to(RingBuffer<uint8_t>* dest, - uint32_t index, - uint32_t protocol, - uint32_t size, - const uint8_t* body); + bool write_to(PBD::RingBuffer<uint8_t>* dest, + uint32_t index, + uint32_t protocol, + uint32_t size, + const uint8_t* body); // Created on demand so the space is only consumed if necessary - RingBuffer<uint8_t>* _to_ui; - RingBuffer<uint8_t>* _from_ui; + PBD::RingBuffer<uint8_t>* _to_ui; + PBD::RingBuffer<uint8_t>* _from_ui; Glib::Threads::Mutex _work_mutex; diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h index 4b95d2ca6e..bfbf98c328 100644 --- a/libs/ardour/ardour/port_manager.h +++ b/libs/ardour/ardour/port_manager.h @@ -104,7 +104,7 @@ class LIBARDOUR_API PortManager void remove_all_ports (); void clear_pending_port_deletions (); virtual void add_pending_port_deletion (Port*) = 0; - RingBuffer<Port*>& port_deletions_pending () { return _port_deletions_pending; } + PBD::RingBuffer<Port*>& port_deletions_pending () { return _port_deletions_pending; } /* per-Port monitoring */ @@ -172,7 +172,7 @@ class LIBARDOUR_API PortManager boost::shared_ptr<AudioBackend> _backend; SerializedRCUManager<Ports> ports; bool _port_remove_in_progress; - RingBuffer<Port*> _port_deletions_pending; + PBD::RingBuffer<Port*> _port_deletions_pending; boost::shared_ptr<Port> register_port (DataType type, const std::string& portname, bool input, bool async = false, PortFlags extra_flags = PortFlags (0)); void port_registration_failure (const std::string& portname); diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 643b863537..740fcae1a2 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -161,7 +161,7 @@ public: void clear_events (SessionEvent::Type type, boost::function<void (void)> after); protected: - RingBuffer<SessionEvent*> pending_events; + PBD::RingBuffer<SessionEvent*> pending_events; typedef std::list<SessionEvent *> Events; Events events; Events immediate_events; diff --git a/libs/ardour/ardour/worker.h b/libs/ardour/ardour/worker.h index 6e1a7c91f1..cc60636622 100644 --- a/libs/ardour/ardour/worker.h +++ b/libs/ardour/ardour/worker.h @@ -102,16 +102,16 @@ private: @param rb the ringbuffer to check @return true if the message is complete, false otherwise */ - bool verify_message_completeness(RingBuffer<uint8_t>* rb); - - Workee* _workee; - RingBuffer<uint8_t>* _requests; - RingBuffer<uint8_t>* _responses; - uint8_t* _response; - PBD::Semaphore _sem; - Glib::Threads::Thread* _thread; - bool _exit; - bool _synchronous; + bool verify_message_completeness(PBD::RingBuffer<uint8_t>* rb); + + Workee* _workee; + PBD::RingBuffer<uint8_t>* _requests; + PBD::RingBuffer<uint8_t>* _responses; + uint8_t* _response; + PBD::Semaphore _sem; + Glib::Threads::Thread* _thread; + bool _exit; + bool _synchronous; }; } // namespace ARDOUR |