official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

unify formatting and comments

This commit is contained in:
Kevin Matz 2022-12-02 13:08:08 -05:00
parent 704c3a2985
commit 11c6013a00
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/qt/qsacnnode.cpp
View File

@ -201,6 +201,7 @@ void QSacnNode::create(const uint16_t num)
if (Source::universe(num)) // already created
return;
qDebug() << "Creating universe " << QString::number(num);
Source::create(num);
tx_universes.emplace(num, new QSacnUniverse(this, Source::universe(num)));
emit creating(tx_universes.value(num));
@ -226,18 +227,21 @@ void QSacnNode::terminate(const uint16_t num)
*/
void QSacnNode::udpReceive()
{
while (hasPendingDatagrams()) {
QNetworkDatagram datagram = receiveDatagram();
// Expecting IANA registered Session Data Transport traffic
if (datagram.destinationPort() != sACN::ACN_SDT_MULTICAST_PORT)
return;
while (hasPendingDatagrams())
{
auto datagram = receiveDatagram();
switch (datagram.senderAddress().protocol()) {
case QAbstractSocket::IPv4Protocol:
// expecting IANA registered Session Data Transport traffic
if (datagram.destinationPort() != sACN::ACN_SDT_MULTICAST_PORT)
return;
// only receive over configured protocols
switch (datagram.senderAddress().protocol()) {
case IPv4Protocol:
if (!enable_IPv4)
return;
break;
case QAbstractSocket::IPv6Protocol:
case IPv6Protocol:
if (!enable_IPv6)
return;
break;

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

@ -246,9 +246,8 @@ void Universe::setValue(const uint16_t address, const uint8_t value)
void Universe::setValue(const uint16_t start, const uint16_t footprint,
const uint8_t* data)
{
if (start == 0)
return;
if (start + footprint > null_start_data.size() - 1)
// start and footprint valid?
if (start < 1 || start + footprint >= null_start_data.size())
return;
null_start_mutex.lock();

2
protocol/esta/sacn/source.cpp
View File

@ -76,7 +76,7 @@ void Source::terminate(const uint16_t num)
return;
universes_mutext_.lock();
auto metadata = universes_[num]->provenance();
auto metadata = universes_.at(num)->provenance();
metadata->options.stream_terminated = true;
universes_.at(num)->setProvenance(metadata);
universes_.erase(num);