official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

rename call back registration function for consistancy

This commit is contained in:
Kevin Matz 2022-12-02 16:35:05 -05:00
parent a03ef79d5d
commit 3135c0ae6c
4 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
platform/qt/qsacnuniverse.cpp
View File

@ -12,18 +12,11 @@ QSacnUniverse::QSacnUniverse(QObject *parent, std::shared_ptr<sACN::Universe> un
if (!universe)
return;
data_change_token = universe_->onData([this](DMX::Universe*) {
emit dataChanged();
});
data_change_token = universe_->onDataChange([this](DMX::Universe*){emit dataChanged();});
status_change_token = universe_->onStatusChange([this](){emit statusChanged();});
if (!universe->isEditable())
list_change_token = universe_->onSourceListChange([this]() {
syncSources();
});
status_change_token = universe_->onStatusChange([this]() {
emit statusChanged();
});
list_change_token = universe_->onSourceListChange([this](){syncSources();});
};

2
protocol/esta/dmx/universe.cpp
View File

@ -268,7 +268,7 @@ void Universe::setValue(const uint16_t start, const uint16_t footprint,
* @param cb
* @return
*/
std::shared_ptr<void> Universe::onData(const DataHandler cb)
std::shared_ptr<void> Universe::onDataChange(const DataHandler cb)
{
// wrap the callback with a shared pointer
auto sp = std::make_shared<DataHandler>(std::move(cb));

2
protocol/esta/dmx/universe.h
View File

@ -60,7 +60,7 @@ class Universe {
const uint8_t* data);
void setData (const std::vector<uint8_t> &);
std::shared_ptr<void> onData (const DataHandler);
std::shared_ptr<void> onDataChange (const DataHandler);
virtual void altSCdata(const std::vector<uint8_t> &);

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

@ -103,8 +103,8 @@ bool ArbitratingUniverse::hasSourceUniverse(const DATA::data_header& src) const
std::shared_ptr<Universe> ArbitratingUniverse::addNewSource(const DATA::data_header &src)
{
sources_.emplace(src, std::make_shared<Universe>());
auto data_token = sources_.at(src)->onData(std::bind(&sACN::ArbitratingUniverse::dataChangedNotifier,
this, std::placeholders::_1));
auto data_token = sources_.at(src)->onDataChange(std::bind(&sACN::ArbitratingUniverse::dataChangedNotifier,
this, std::placeholders::_1));
source_data_tokens.push_back(data_token);
doListChangeCallbacks();