official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

rename private variable

This commit is contained in:
Kevin Matz 2022-12-09 18:17:04 -05:00
parent c9dec23ea9
commit fe8bc039bc
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
protocol/esta/sacn/arbitratinguniverse.cpp
View File

@ -34,7 +34,7 @@ namespace sACN {
ArbitratingUniverse::ArbitratingUniverse()
: sACN::Universe()
, expectedUniverse(0)
, HoldLastLook(true)
, hold_last_look_(true)
{
}
@ -54,7 +54,7 @@ ArbitratingUniverse::~ArbitratingUniverse()
void ArbitratingUniverse::setHoldLastLook(const bool state)
{
std::unique_lock lk_ctl(mtx_control);
HoldLastLook = state;
hold_last_look_ = state;
}
@ -65,7 +65,7 @@ void ArbitratingUniverse::setHoldLastLook(const bool state)
bool ArbitratingUniverse::getHoldLastLook() const
{
std::shared_lock lk_ctl(mtx_control);
return HoldLastLook;
return hold_last_look_;
}
@ -137,7 +137,7 @@ void ArbitratingUniverse::deleteSourceUniverse(const DATA::data_header& src)
std::shared_lock lk_ctl(mtx_control);
if (!hasSourceUniverse(src))
return;
if (sources_.size() == 1 && HoldLastLook)
if (sources_.size() == 1 && hold_last_look_)
return;
std::unique_lock lk_wctl(lk_ctl);
sources_.erase(src);
@ -386,7 +386,7 @@ void ArbitratingUniverse::purge_stale_sources_(std::unordered_map<DATA::data_hea
auto age = it->first;
auto key = it->second;
// the lastest source universe is never purged if holding the last look
if (sources_.size() == 1 && HoldLastLook)
if (sources_.size() == 1 && hold_last_look_)
break;
// it's a sorted container. If this universe is live, so are the remainder.
if (age < E131_NETWORK_DATA_LOSS_TIMEOUT)

15
protocol/esta/sacn/arbitratinguniverse.h
View File

@ -67,29 +67,24 @@ public:
void deleteSourceUniverse(const DATA::data_header&);
void dataChangedNotifier(DMX::Universe* universe);
// SACN::Universe overrides:
// DMX::Universe overrides:
virtual uint8_t status() override;
uint8_t slot(const uint16_t) override;
double rxRate() override;
// sACN::Universe Overrides
std::shared_ptr<DATA::data_header> metadata() override;
void setMetadata(std::shared_ptr<DATA::data_header>) override {};
bool isSyncronized() override;
void synchronize(uint8_t = 0) override;
bool isEditable() const override;
uint16_t activeSlots() override;
// api for poly-source universes
const std::vector<DATA::data_header> sources() const override;
std::shared_ptr<Universe> sourceUniverse(const DATA::data_header&) override;
std::shared_ptr<Universe> addNewSource(const DATA::data_header&) override;
std::shared_ptr<void> onSourceListChange(std::function<void()>) override;
// DMX::Universe Overrides:
uint8_t slot(const uint16_t) override;
double rxRate() override;
protected:
void doListChangeCallbacks();
@ -103,7 +98,7 @@ private:
std::vector<std::shared_ptr<void>> source_status_tokens; //!< source universe data change tokens
bool HoldLastLook;
bool hold_last_look_;
std::shared_ptr<Universe> dominant_();
void purge_stale_sources_(std::unordered_map<DATA::data_header, uint> * = nullptr);