diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h index c89ca697a1..a615be6c10 100644 --- a/libs/ardour/ardour/port_manager.h +++ b/libs/ardour/ardour/port_manager.h @@ -260,7 +260,7 @@ public: protected: boost::shared_ptr _backend; - SerializedRCUManager ports; + SerializedRCUManager _ports; bool _port_remove_in_progress; PBD::RingBuffer _port_deletions_pending; diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index aeb985c386..6ed04adae6 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -146,7 +146,7 @@ AudioEngine::split_cycle (pframes_t nframes) { /* caller must hold process lock */ - boost::shared_ptr p = ports.reader(); + boost::shared_ptr p = _ports.reader(); /* This is mainly for the benefit of rt-control ports (MTC, MClk) * diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index 3a5ae325ab..c565ecf254 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -138,7 +138,7 @@ PortManager::PortMetaData::PortMetaData (XMLNode const& node) /* ****************************************************************************/ PortManager::PortManager () - : ports (new Ports) + : _ports (new Ports) , _port_remove_in_progress (false) , _port_deletions_pending (8192) /* ick, arbitrary sizing */ , _midi_info_dirty (true) @@ -174,14 +174,14 @@ PortManager::remove_all_ports () */ { - RCUWriter writer (ports); + RCUWriter writer (_ports); boost::shared_ptr ps = writer.get_copy (); ps->clear (); } /* clear dead wood list in RCU */ - ports.flush (); + _ports.flush (); /* clear out pending port deletion list. we know this is safe because * the auto connect thread in Session is already dead when this is @@ -384,7 +384,7 @@ PortManager::get_port_by_name (const string& portname) return boost::shared_ptr (); } - boost::shared_ptr pr = ports.reader(); + boost::shared_ptr pr = _ports.reader(); std::string rel = make_port_name_relative (portname); Ports::iterator x = pr->find (rel); @@ -407,7 +407,7 @@ PortManager::get_port_by_name (const string& portname) void PortManager::port_renamed (const std::string& old_relative_name, const std::string& new_relative_name) { - RCUWriter writer (ports); + RCUWriter writer (_ports); boost::shared_ptr p = writer.get_copy(); Ports::iterator x = p->find (old_relative_name); @@ -421,7 +421,7 @@ PortManager::port_renamed (const std::string& old_relative_name, const std::stri int PortManager::get_ports (DataType type, PortList& pl) { - boost::shared_ptr plist = ports.reader(); + boost::shared_ptr plist = _ports.reader(); for (Ports::iterator p = plist->begin(); p != plist->end(); ++p) { if (p->second->type() == type) { pl.push_back (p->second); @@ -507,7 +507,7 @@ PortManager::register_port (DataType dtype, const string& portname, bool input, newport->set_buffer_size (AudioEngine::instance()->samples_per_cycle()); - RCUWriter writer (ports); + RCUWriter writer (_ports); boost::shared_ptr ps = writer.get_copy (); ps->insert (make_pair (make_port_name_relative (portname), newport)); @@ -522,7 +522,7 @@ PortManager::register_port (DataType dtype, const string& portname, bool input, throw PortRegistrationFailure (string_compose ("unable to create port '%1': %2", portname, _("(unknown error)"))); } - DEBUG_TRACE (DEBUG::Ports, string_compose ("\t%2 port registration success, ports now = %1\n", ports.reader()->size(), this)); + DEBUG_TRACE (DEBUG::Ports, string_compose ("\t%2 port registration success, ports now = %1\n", _ports.reader()->size(), this)); return newport; } @@ -550,7 +550,7 @@ PortManager::unregister_port (boost::shared_ptr port) /* caller must hold process lock */ { - RCUWriter writer (ports); + RCUWriter writer (_ports); boost::shared_ptr ps = writer.get_copy (); Ports::iterator x = ps->find (make_port_name_relative (port->name())); @@ -562,7 +562,7 @@ PortManager::unregister_port (boost::shared_ptr port) /* writer goes out of scope, forces update */ } - ports.flush (); + _ports.flush (); return 0; } @@ -701,7 +701,7 @@ PortManager::reestablish_ports () { Ports::iterator i; _midi_info_dirty = true; - boost::shared_ptr p = ports.reader (); + boost::shared_ptr p = _ports.reader (); DEBUG_TRACE (DEBUG::Ports, string_compose ("reestablish %1 ports\n", p->size())); for (i = p->begin(); i != p->end(); ++i) { @@ -775,7 +775,7 @@ PortManager::set_pretty_names (std::vector const& port_names, DataT int PortManager::reconnect_ports () { - boost::shared_ptr p = ports.reader (); + boost::shared_ptr p = _ports.reader (); /* re-establish connections */ @@ -798,7 +798,7 @@ PortManager::connect_callback (const string& a, const string& b, bool conn) boost::shared_ptr port_a; boost::shared_ptr port_b; Ports::iterator x; - boost::shared_ptr pr = ports.reader (); + boost::shared_ptr pr = _ports.reader (); x = pr->find (make_port_name_relative (a)); if (x != pr->end()) { @@ -1043,7 +1043,7 @@ PortManager::cycle_start (pframes_t nframes, Session* s) Port::set_global_port_buffer_offset (0); Port::set_cycle_samplecnt (nframes); - _cycle_ports = ports.reader (); + _cycle_ports = _ports.reader (); /* TODO optimize * - when speed == 1.0, the resampler copies data without processing @@ -1655,7 +1655,7 @@ PortManager::fill_midi_port_info_locked () void PortManager::set_port_buffer_sizes (pframes_t n) { - boost::shared_ptr all = ports.reader(); + boost::shared_ptr all = _ports.reader(); for (Ports::iterator p = all->begin(); p != all->end(); ++p) { p->second->set_buffer_size (n); @@ -1667,7 +1667,7 @@ bool PortManager::check_for_ambiguous_latency (bool log) const { bool rv = false; - boost::shared_ptr plist = ports.reader(); + boost::shared_ptr plist = _ports.reader(); for (Ports::iterator pi = plist->begin(); pi != plist->end(); ++pi) { boost::shared_ptr const& p (pi->second); if (! p->sends_output () || (p->flags () & IsTerminal)) {