Skip to content

Commit

Permalink
plugins: add missing writeUniverse updates
Browse files Browse the repository at this point in the history
  • Loading branch information
mcallegari committed Jun 27, 2023
1 parent 5b5f076 commit c4c94be
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
8 changes: 6 additions & 2 deletions plugins/dmxusb/src/nanodmx.cpp
Expand Up @@ -251,7 +251,7 @@ QString NanoDMX::additionalInfo() const
* Write universe data
****************************************************************************/

bool NanoDMX::writeUniverse(quint32 universe, quint32 output, const QByteArray& data)
bool NanoDMX::writeUniverse(quint32 universe, quint32 output, const QByteArray& data, bool dataChanged)
{
Q_UNUSED(universe)
Q_UNUSED(output)
Expand All @@ -267,8 +267,12 @@ bool NanoDMX::writeUniverse(quint32 universe, quint32 output, const QByteArray&
//qDebug() << "Writing universe...";

if (m_outputLines[0].m_universeData.size() == 0)
{
m_outputLines[0].m_universeData.append(data);
else
m_outputLines[0].m_universeData.append(DMX_CHANNELS - data.size(), 0);
}

if (dataChanged)
m_outputLines[0].m_universeData.replace(0, data.size(), data);

return true;
Expand Down
2 changes: 1 addition & 1 deletion plugins/dmxusb/src/nanodmx.h
Expand Up @@ -53,7 +53,7 @@ class NanoDMX : public QThread, public DMXUSBWidget
QString additionalInfo() const;

/** @reimp */
bool writeUniverse(quint32 universe, quint32 output, const QByteArray& data);
bool writeUniverse(quint32 universe, quint32 output, const QByteArray& data, bool dataChanged);

protected:
/** Stop the writer thread */
Expand Down
3 changes: 2 additions & 1 deletion plugins/peperoni/unix/peperoni.cpp
Expand Up @@ -125,9 +125,10 @@ QString Peperoni::outputInfo(quint32 output)
return str;
}

void Peperoni::writeUniverse(quint32 universe, quint32 output, const QByteArray &data)
void Peperoni::writeUniverse(quint32 universe, quint32 output, const QByteArray &data, bool dataChanged)
{
Q_UNUSED(universe)
Q_UNUSED(dataChanged)

if (m_devices.contains(output) == false)
return;
Expand Down
2 changes: 1 addition & 1 deletion plugins/peperoni/unix/peperoni.h
Expand Up @@ -75,7 +75,7 @@ class Peperoni : public QLCIOPlugin
QString outputInfo(quint32 output);

/** @reimp */
void writeUniverse(quint32 universe, quint32 output, const QByteArray& data);
void writeUniverse(quint32 universe, quint32 output, const QByteArray& data, bool dataChanged);

/*************************************************************************
* Inputs
Expand Down
3 changes: 2 additions & 1 deletion plugins/peperoni/win32/peperoni.cpp
Expand Up @@ -149,9 +149,10 @@ QString Peperoni::outputInfo(quint32 output)
return str;
}

void Peperoni::writeUniverse(quint32 universe, quint32 output, const QByteArray &data)
void Peperoni::writeUniverse(quint32 universe, quint32 output, const QByteArray &data, bool dataChanged)
{
Q_UNUSED(universe)
Q_UNUSED(dataChanged)

if (output < quint32(m_devices.size()))
m_devices.at(output)->outputDMX(data);
Expand Down
2 changes: 1 addition & 1 deletion plugins/peperoni/win32/peperoni.h
Expand Up @@ -75,7 +75,7 @@ class Peperoni : public QLCIOPlugin
QString outputInfo(quint32 output);

/** @reimp */
void writeUniverse(quint32 universe, quint32 output, const QByteArray& data);
void writeUniverse(quint32 universe, quint32 output, const QByteArray& data, bool dataChanged);

/** Attempt to find all connected Peperoni devices */
void rescanDevices();
Expand Down

0 comments on commit c4c94be

Please sign in to comment.