Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Osc in Mixxx + ARM64/2.6 (20241104) #13835

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
Open

Osc in Mixxx + ARM64/2.6 (20241104) #13835

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7794337
eve osc ok 20241001
evelynnev Oct 1, 2024
83b6074
eve osc ok 20241002
evelynnev Oct 2, 2024
853cea7
eve osc ok 20241002
evelynnev Oct 2, 2024
034e460
eve osc ok 20241002
evelynnev Oct 2, 2024
94f02ad
eve osc ok 20241002
evelynnev Oct 2, 2024
df13928
eve osc ok 20241002
evelynnev Oct 2, 2024
fc216c7
eve osc ok 20241002
evelynnev Oct 2, 2024
f059ebb
eve osc ok 20241002
evelynnev Oct 2, 2024
87a9397
eve osc ok 20241002
evelynnev Oct 2, 2024
605b32b
eve osc ok 20241003
evelynnev Oct 3, 2024
16e7ea6
eve osc ok 20241003
evelynnev Oct 3, 2024
2b2180b
eve ok 20241004
evelynnev Oct 4, 2024
4f813e2
eve ok 20241004
evelynnev Oct 4, 2024
06e1834
OSC_in_Mixxx_ARM64_Support/2.6
evelynnev Nov 4, 2024
6153ef4
OSC_in_Mixxx_ARM64_Support/2.6 wit a comment to get the pr get compiled
evelynnev Nov 5, 2024
5ef070d
Merge branch 'mixxxdj:main' into OSC_in_Mixxx-ARM64/2.6
Eve00000 Jan 14, 2025
60390bf
Update oscreceiver.cpp
Eve00000 Jan 14, 2025
dd8fea6
Update CMakeLists.txt
Eve00000 Jan 14, 2025
454b046
Update CMakeLists.txt
Eve00000 Jan 14, 2025
1f82de1
Update CMakeLists.txt
Eve00000 Jan 14, 2025
69ecf39
ReviewSolutions01
evelynnev Jan 20, 2025
1f66857
ReviewSolutions02
evelynnev Jan 20, 2025
05b0913
ReviewSolutions03
evelynnev Jan 20, 2025
802a84b
EscapeJSonArtistTitle
evelynnev Jan 21, 2025
d072267
EscapeJSonArtistTitle
evelynnev Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
eve osc ok 20241002
  • Loading branch information
@evelynnev
evelynnev committed Oct 2, 2024
commit 034e46072de8f291c9c48f23652031f3016831d2
14 changes: 11 additions & 3 deletions src/engine/enginebuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,14 +607,22 @@ void EngineBuffer::slotTrackLoaded(TrackPointer pTrack,
0,
0,
1);
// OscFunctionsSendPtrType(m_pConfig,
// getGroup(),
// "duration",
// FLOATBODY,
// "",
// 0,
// 0,
// pTrack->getDuration());
OscFunctionsSendPtrType(m_pConfig,
getGroup(),
"duration",
FLOATBODY,
DOUBLEBODY,
"",
0,
0,
pTrack->getDuration());
pTrack->getDuration(),
0);
}
// EveOSC end

Expand Down
14 changes: 11 additions & 3 deletions src/mixer/basetrackplayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,14 +944,22 @@ void BaseTrackPlayerImpl::slotPlayToggled(double value) {
}
// EveOSC begin
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
// OscFunctionsSendPtrType(m_pConfig,
// getGroup(),
// "play",
// FLOATBODY,
// "",
// 0,
// 0,
// value);
OscFunctionsSendPtrType(m_pConfig,
getGroup(),
"play",
FLOATBODY,
DOUBLEBODY,
"",
0,
0,
value);
value,
0);
}
// EveOSC end
}
Expand Down
20 changes: 15 additions & 5 deletions src/osc/oscfunctions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
};

void OscFunctionsSendPtrType(UserSettingsPointer m_pConfig,
QString OscGroup,

Check failure on line 26 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Missing reference on large type (sizeof class QString is 24 bytes) [-Wclazy-function-args-by-ref]
QString OscKey,

Check failure on line 27 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Missing reference on large type (sizeof class QString is 24 bytes) [-Wclazy-function-args-by-ref]
enum DefOscBodyType OscBodyType,
QString OscMessageBodyQString,

Check failure on line 29 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Missing reference on large type (sizeof class QString is 24 bytes) [-Wclazy-function-args-by-ref]
int OscMessageBodyInt,
double OscMessageBodyDouble,
float OscMessageBodyFloat) {
Expand Down Expand Up @@ -79,7 +79,9 @@
QString CKOscPortOut = m_pConfig->getValue(ConfigKey("[OSC]", "OscPortOut"));
int CKOscPortOutInt = CKOscPortOut.toInt();
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver1Active"))) {
QString CKOscRec1Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver1Active"));
// QString CKOscRec1Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver1Active"));
QString CKOscRec1Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver1Ip"));
QByteArray CKOscRec1Ipba = CKOscRec1Ip.toLocal8Bit();
const char* CKOscRec1IpChar = CKOscRec1Ipba.data();
Expand All @@ -89,11 +91,13 @@
qDebug() << "OSC Msg Send to Receiver 1 ("
<< CKOscRec1IpChar << ":" << CKOscPortOutInt
<< QString(") : <%1 : %2")
.arg(OscMessageHeader)

Check failure on line 94 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(MixxxOSCStatusTxtBody);
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver2Active"))) {
QString CKOscRec2Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver2Active"));
// QString CKOscRec2Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver2Active"));
QString CKOscRec2Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver2Ip"));
QByteArray CKOscRec2Ipba = CKOscRec2Ip.toLocal8Bit();
const char* CKOscRec2IpChar = CKOscRec2Ipba.data();
Expand All @@ -103,11 +107,13 @@
qDebug() << "OSC Msg Send to Receiver 2 ("
<< CKOscRec2IpChar << ":" << CKOscPortOutInt
<< QString(") : <%1 : %2")
.arg(OscMessageHeader)

Check failure on line 110 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(MixxxOSCStatusTxtBody);
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver3Active"))) {
QString CKOscRec3Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver3Active"));
// QString CKOscRec3Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver3Active"));
QString CKOscRec3Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver3Ip"));
QByteArray CKOscRec3Ipba = CKOscRec3Ip.toLocal8Bit();
const char* CKOscRec3IpChar = CKOscRec3Ipba.data();
Expand All @@ -117,11 +123,13 @@
qDebug() << "OSC Msg Send to Receiver 3 ("
<< CKOscRec3IpChar << ":" << CKOscPortOutInt
<< QString(") : <%1 : %2")
.arg(OscMessageHeader)

Check failure on line 126 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(MixxxOSCStatusTxtBody);
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver4Active"))) {
QString CKOscRec4Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver4Active"));
// QString CKOscRec4Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver4Active"));
QString CKOscRec4Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver4Ip"));
QByteArray CKOscRec4Ipba = CKOscRec4Ip.toLocal8Bit();
const char* CKOscRec4IpChar = CKOscRec4Ipba.data();
Expand All @@ -130,11 +138,13 @@
qDebug() << "OSC Msg Send to Receiver 4 ("
<< CKOscRec4IpChar << ":" << CKOscPortOutInt
<< QString(") : <%1 : %2")
.arg(OscMessageHeader)

Check failure on line 141 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(MixxxOSCStatusTxtBody);
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver5Active"))) {
QString CKOscRec5Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver5Active"));
// QString CKOscRec5Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver5Active"));
QString CKOscRec5Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver5Ip"));
QByteArray CKOscRec5Ipba = CKOscRec5Ip.toLocal8Bit();
const char* CKOscRec5IpChar = CKOscRec5Ipba.data();
Expand All @@ -144,7 +154,7 @@
qDebug() << "OSC Msg Send to Receiver 5 ("
<< CKOscRec5IpChar << ":" << CKOscPortOutInt
<< QString(") : <%1 : %2")
.arg(OscMessageHeader)

Check failure on line 157 in src/osc/oscfunctions.h

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(MixxxOSCStatusTxtBody);
}
} else {
Expand Down
45 changes: 32 additions & 13 deletions src/osc/oscreceiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <cstring>
#include <iostream>

#pragma comment(lib, "winmm.lib")

Check failure on line 7 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / macOS 12 x64 

unknown pragma ignored [-Werror,-Wunknown-pragmas]

Check failure on line 7 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / macOS 12 arm64 

unknown pragma ignored [-Werror,-Wunknown-pragmas]

Check failure on line 7 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 22.04 

ignoring ‘#pragma comment ’ [-Werror=unknown-pragmas]

Check warning on line 7 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / coverage 

ignoring ‘#pragma comment ’ [-Wunknown-pragmas]

#include "control/controlobject.h"
#include "control/controlproxy.h"
Expand Down Expand Up @@ -59,14 +59,13 @@
}

osc::ReceivedMessageArgumentStream args = m.ArgumentStream();
osc::ReceivedMessage::const_iterator arg = m.ArgumentsBegin();
// osc::ReceivedMessage::const_iterator arg = m.ArgumentsBegin();

float oscInVal;
args >> oscInVal >> osc::EndMessage;

oscResult oscIn;
oscIn.oscAddress = m.AddressPattern();
oscIn.oscGroup, oscIn.oscKey;
oscIn.oscAddress.replace("/", "");
oscIn.oscAddress.replace("(", "[");
oscIn.oscAddress.replace(")", "]");
Expand Down Expand Up @@ -104,7 +103,7 @@
std::unique_ptr<PollingControlProxy> m_poscPCP;
m_poscPCP = std::make_unique<PollingControlProxy>(
oscIn.oscGroup, oscIn.oscKey);
float m_posPCPValue = m_poscPCP->get();

Check failure on line 106 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 22.04 

conversion from ‘double’ to ‘float’ may change value [-Werror=float-conversion]

Check warning on line 106 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / coverage 

conversion from ‘double’ to ‘float’ may change value [-Wfloat-conversion]
OscFunctionsSendPtrType(m_pConfig,
oscIn.oscGroup,
oscIn.oscKey,
Expand All @@ -130,13 +129,23 @@
OscFunctionsSendPtrType(m_pConfig,
oscIn.oscGroup,
oscIn.oscKey,
INTBODY,
FLOATBODY,
"",
0,
0,
ControlObject::getControl(
oscIn.oscGroup, oscIn.oscKey)
->getParameter(),
0,
0);
->get());

Check failure on line 138 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 22.04 

conversion from ‘double’ to ‘float’ may change value [-Werror=float-conversion]

Check warning on line 138 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / coverage 

conversion from ‘double’ to ‘float’ may change value [-Wfloat-conversion]
// OscFunctionsSendPtrType(m_pConfig,
// oscIn.oscGroup,
// oscIn.oscKey,
// INTBODY,
// "",
// ControlObject::getControl(
// oscIn.oscGroup, oscIn.oscKey)
// ->getParameter(),
// 0,
// 0);
}
qDebug() << "OSC Msg Rcvd: Get Group, Key: Value: "
<< oscIn.oscGroup << "," << oscIn.oscKey << ":"
Expand All @@ -156,7 +165,7 @@
m_poscPCP = std::make_unique<PollingControlProxy>(
oscIn.oscGroup, oscIn.oscKey);
m_poscPCP->set(oscIn.oscValue);
float m_posPCPValue = m_poscPCP->get();

Check failure on line 168 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / Ubuntu 22.04 

conversion from ‘double’ to ‘float’ may change value [-Werror=float-conversion]

Check warning on line 168 in src/osc/oscreceiver.cpp

View workflow job for this annotation

GitHub Actions / coverage 

conversion from ‘double’ to ‘float’ may change value [-Wfloat-conversion]
OscFunctionsSendPtrType(m_pConfig,
oscIn.oscGroup,
oscIn.oscKey,
Expand Down Expand Up @@ -194,14 +203,16 @@

void OscReceiverMain(UserSettingsPointer m_pConfig) {
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscEnabled"))) {
QString CKOscPortOut = m_pConfig->getValue(ConfigKey("[OSC]", "OscPortOut"));
// QString CKOscPortOut = m_pConfig->getValue(ConfigKey("[OSC]", "OscPortOut"));
QString CKOscPortIn = m_pConfig->getValue(ConfigKey("[OSC]", "OscPortIn"));
int CKOscPortOutInt = CKOscPortOut.toInt();
// int CKOscPortOutInt = CKOscPortOut.toInt();
int CKOscPortInInt = CKOscPortIn.toInt();
qDebug() << "OSC Enabled -> Started";

if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver1Active"))) {
QString CKOscRec1Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver1Active"));
// QString CKOscRec1Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver1Active"));
QString CKOscRec1Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver1Ip"));
QByteArray CKOscRec1Ipba = CKOscRec1Ip.toLocal8Bit();
const char* CKOscRec1IpChar = CKOscRec1Ipba.data();
Expand All @@ -211,7 +222,9 @@
qDebug() << "Mixxx OSC Receiver 1 Not Activated";
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver2Active"))) {
QString CKOscRec2Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver2Active"));
// QString CKOscRec2Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver2Active"));
QString CKOscRec2Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver2Ip"));
QByteArray CKOscRec2Ipba = CKOscRec2Ip.toLocal8Bit();
const char* CKOscRec2IpChar = CKOscRec2Ipba.data();
Expand All @@ -221,7 +234,9 @@
qDebug() << "Mixxx OSC Receiver 2 Not Activated";
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver3Active"))) {
QString CKOscRec3Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver3Active"));
// QString CKOscRec3Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver3Active"));
QString CKOscRec3Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver3Ip"));
QByteArray CKOscRec3Ipba = CKOscRec3Ip.toLocal8Bit();
const char* CKOscRec3IpChar = CKOscRec3Ipba.data();
Expand All @@ -231,7 +246,9 @@
qDebug() << "Mixxx OSC Receiver 3 Not Activated";
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver4Active"))) {
QString CKOscRec4Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver4Active"));
// QString CKOscRec4Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver4Active"));
QString CKOscRec4Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver4Ip"));
QByteArray CKOscRec4Ipba = CKOscRec4Ip.toLocal8Bit();
const char* CKOscRec4IpChar = CKOscRec4Ipba.data();
Expand All @@ -241,7 +258,9 @@
qDebug() << "Mixxx OSC Receiver 4 Not Activated";
}
if (m_pConfig->getValue<bool>(ConfigKey("[OSC]", "OscReceiver5Active"))) {
QString CKOscRec5Active = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver5Active"));
// QString CKOscRec5Active =
// m_pConfig->getValue(ConfigKey("[OSC]",
// "OscReceiver5Active"));
QString CKOscRec5Ip = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver5Ip"));
QByteArray CKOscRec5Ipba = CKOscRec5Ip.toLocal8Bit();
const char* CKOscRec5IpChar = CKOscRec5Ipba.data();
Expand Down
56 changes: 9 additions & 47 deletions src/preferences/dialog/dlgprefosc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,6 @@
setupUi(this);

// If OSC Receiver X is active -> OSC messages from Mixxx will be send to this receiver
connect(OscReceiver1ActiveCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefOsc::slotToggleOscReceiver1Active);

connect(OscReceiver2ActiveCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefOsc::slotToggleOscReceiver1Active);

connect(OscReceiver3ActiveCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefOsc::slotToggleOscReceiver1Active);

connect(OscReceiver4ActiveCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefOsc::slotToggleOscReceiver1Active);

connect(OscReceiver5ActiveCheckBox,
&QCheckBox::stateChanged,
this,
&DlgPrefOsc::slotToggleOscReceiver1Active);

setScrollSafeGuardForAllInputWidgets(this);
}
Expand All @@ -51,8 +27,6 @@

OscReceiver1ActiveCheckBox->setChecked(m_pConfig->getValue(
ConfigKey("[OSC]", "OscReceiver1Active"), false));
QString OscReceiver1IpTest = m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver1Ip"));

OscReceiver1IpByte1->setValue(
m_pConfig->getValue(ConfigKey("[OSC]", "OscReceiver1IpByte1"), 1));
OscReceiver1IpByte2->setValue(
Expand Down Expand Up @@ -128,11 +102,13 @@
// m_pConfig->setValue(ConfigKey("[OSC]", "OscIpMtuSize"),
// OscIpMtuSize->value());

m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver1Active"),
OscReceiver1ActiveCheckBox->isChecked());

QString OscReceiverIp, OscReceiverIpByte1, OscReceiverIpByte2,
OscReceiverIpByte3, OscReceiverIpByte4;

// Receiver 1
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver1Active"),
OscReceiver1ActiveCheckBox->isChecked());
OscReceiverIpByte1 = QString("%1").arg(OscReceiver1IpByte1->value());
OscReceiverIpByte2 = QString("%1").arg(OscReceiver1IpByte2->value());
OscReceiverIpByte3 = QString("%1").arg(OscReceiver1IpByte3->value());
Expand All @@ -140,7 +116,7 @@
OscReceiverIp = QString("%1.%2.%3.%4")
.arg(OscReceiverIpByte1)
.arg(OscReceiverIpByte2)
.arg(OscReceiverIpByte3)

Check failure on line 119 in src/preferences/dialog/dlgprefosc.cpp

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(OscReceiverIpByte4);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver1Ip"), OscReceiverIp);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver1IpByte1"),
Expand All @@ -152,9 +128,9 @@
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver1IpByte4"),
OscReceiver1IpByte4->value());

// Receiver 2
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver2Active"),
OscReceiver2ActiveCheckBox->isChecked());

OscReceiverIpByte1 = QString("%1").arg(OscReceiver2IpByte1->value());
OscReceiverIpByte2 = QString("%1").arg(OscReceiver2IpByte2->value());
OscReceiverIpByte3 = QString("%1").arg(OscReceiver2IpByte3->value());
Expand All @@ -162,7 +138,7 @@
OscReceiverIp = QString("%1.%2.%3.%4")
.arg(OscReceiverIpByte1)
.arg(OscReceiverIpByte2)
.arg(OscReceiverIpByte3)

Check failure on line 141 in src/preferences/dialog/dlgprefosc.cpp

View workflow job for this annotation

GitHub Actions / clazy 

Use multi-arg instead [-Wclazy-qstring-arg]
.arg(OscReceiverIpByte4);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver2Ip"), OscReceiverIp);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver2IpByte1"),
Expand All @@ -174,9 +150,9 @@
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver2IpByte4"),
OscReceiver2IpByte4->value());

// Receiver 3
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver3Active"),
OscReceiver3ActiveCheckBox->isChecked());

OscReceiverIpByte1 = QString("%1").arg(OscReceiver3IpByte1->value());
OscReceiverIpByte2 = QString("%1").arg(OscReceiver3IpByte2->value());
OscReceiverIpByte3 = QString("%1").arg(OscReceiver3IpByte3->value());
Expand All @@ -186,7 +162,6 @@
.arg(OscReceiverIpByte2)
.arg(OscReceiverIpByte3)
.arg(OscReceiverIpByte4);

m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver3Ip"), OscReceiverIp);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver3IpByte1"),
OscReceiver3IpByte1->value());
Expand All @@ -197,9 +172,9 @@
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver3IpByte4"),
OscReceiver3IpByte4->value());

// Receiver 4
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver4Active"),
OscReceiver4ActiveCheckBox->isChecked());

OscReceiverIpByte1 = QString("%1").arg(OscReceiver4IpByte1->value());
OscReceiverIpByte2 = QString("%1").arg(OscReceiver4IpByte2->value());
OscReceiverIpByte3 = QString("%1").arg(OscReceiver4IpByte3->value());
Expand All @@ -209,7 +184,6 @@
.arg(OscReceiverIpByte2)
.arg(OscReceiverIpByte3)
.arg(OscReceiverIpByte4);

m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver4Ip"), OscReceiverIp);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver4IpByte1"),
OscReceiver4IpByte1->value());
Expand All @@ -220,9 +194,9 @@
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver4IpByte4"),
OscReceiver4IpByte4->value());

// Receiver 5
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver5Active"),
OscReceiver5ActiveCheckBox->isChecked());

OscReceiverIpByte1 = QString("%1").arg(OscReceiver5IpByte1->value());
OscReceiverIpByte2 = QString("%1").arg(OscReceiver5IpByte2->value());
OscReceiverIpByte3 = QString("%1").arg(OscReceiver5IpByte3->value());
Expand All @@ -232,7 +206,6 @@
.arg(OscReceiverIpByte2)
.arg(OscReceiverIpByte3)
.arg(OscReceiverIpByte4);

m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver5Ip"), OscReceiverIp);
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver5IpByte1"),
OscReceiver5IpByte1->value());
Expand All @@ -243,9 +216,9 @@
m_pConfig->setValue(ConfigKey("[OSC]", "OscReceiver5IpByte4"),
OscReceiver5IpByte4->value());

// Sync Triggers
m_pConfig->setValue(ConfigKey("[OSC]", "OscSendSyncTriggers"),
OscEnabledCheckBox->isChecked());

m_pConfig->setValue(ConfigKey("[OSC]", "OscSendSyncTriggersInterval"),
OscSendSyncTriggersInterval->value());
}
Expand All @@ -258,14 +231,3 @@
OscReceiver4ActiveCheckBox->setChecked(false);
OscReceiver5ActiveCheckBox->setChecked(false);
}

void DlgPrefOsc::slotToggleOscReceiver1Active(int buttonState) {
}
void DlgPrefOsc::slotToggleOscReceiver2Active(int buttonState) {
}
void DlgPrefOsc::slotToggleOscReceiver3Active(int buttonState) {
}
void DlgPrefOsc::slotToggleOscReceiver4Active(int buttonState) {
}
void DlgPrefOsc::slotToggleOscReceiver5Active(int buttonState) {
}
5 changes: 0 additions & 5 deletions src/preferences/dialog/dlgprefosc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ class DlgPrefOsc : public DlgPreferencePage, public Ui::DlgPrefOscDlg {
void slotResetToDefaults() override;

private slots:
void slotToggleOscReceiver1Active(int buttonState);
void slotToggleOscReceiver2Active(int buttonState);
void slotToggleOscReceiver3Active(int buttonState);
void slotToggleOscReceiver4Active(int buttonState);
void slotToggleOscReceiver5Active(int buttonState);

private:
UserSettingsPointer m_pConfig;
Expand Down
Loading