From 1fee46899e652ff49e1e435533b25c8ce8520543 Mon Sep 17 00:00:00 2001 From: rogo Date: Mon, 20 Apr 2020 15:31:35 +0200 Subject: [PATCH] code cleanup, added brightness --- src/ledhandler.cpp | 27 +++-- src/ledhandler.h | 3 +- src/plugin.cpp | 256 +-------------------------------------------- 3 files changed, 20 insertions(+), 266 deletions(-) diff --git a/src/ledhandler.cpp b/src/ledhandler.cpp index 6e79dee..cadc4c2 100644 --- a/src/ledhandler.cpp +++ b/src/ledhandler.cpp @@ -1,5 +1,6 @@ #include "ledhandler.h" +#include #include LEDHandler::LEDHandler(QUdpSocket* sock, TS3Functions ts3Functions) @@ -7,8 +8,6 @@ LEDHandler::LEDHandler(QUdpSocket* sock, TS3Functions ts3Functions) mSock = sock; mTs3Functions = ts3Functions; - connect(mSock, &QUdpSocket::connected, this, &LEDHandler::connected); - connect(mSock, &QUdpSocket::disconnected, this, &LEDHandler::disconnected); connect(mSock, &QUdpSocket::hostFound, this, &LEDHandler::hostFound); } @@ -26,20 +25,24 @@ void LEDHandler::talkingEnded() void LEDHandler::poked() { - // start timer sendColor(0, 0, 0, 255, 5); } +void LEDHandler::clientMoved() +{ + sendColor(255, 255, 0, 0, 1); +} + void LEDHandler::sendColor(int R, int G, int B, int W, int t) { QByteArray msg; msg.append(3); - msg.append(t); + msg.append((uint)t); for (int n = 0; n < cLEDNUM; n++) { - msg.append(R); - msg.append(G); - msg.append(B); - msg.append(W); + msg.append((int)R * brightness/100); + msg.append((int)G * brightness/100); + msg.append((int)B * brightness/100); + msg.append((int)W * brightness/100); } mSock->writeDatagram(msg, QHostAddress(cURL), cPORT); @@ -47,21 +50,17 @@ void LEDHandler::sendColor(int R, int G, int B, int W, int t) void LEDHandler::connected() { - mTs3Functions.logMessage("CONNECTED", LogLevel_INFO, "Plugin", 0); - printf("CONNECTED\n"); + sendColor(0, 255, 0, 0, 1); } void LEDHandler::disconnected() { - mTs3Functions.logMessage("DISCONNECTED", LogLevel_INFO, "Plugin", 0); - printf("DISCONNECTED\n"); + sendColor(255, 0, 0, 0, 1); } void LEDHandler::hostFound() { - mTs3Functions.logMessage("HOST FOUND", LogLevel_INFO, "Plugin", 0); printf("HOST FOUND\n"); - succesful = true; } diff --git a/src/ledhandler.h b/src/ledhandler.h index 63c812e..5b47139 100644 --- a/src/ledhandler.h +++ b/src/ledhandler.h @@ -17,6 +17,7 @@ public: void talkingEnded(); void talkingStarted(); void poked(); + void clientMoved(); public slots: void connected(); @@ -26,7 +27,7 @@ public slots: private: QUdpSocket* mSock; TS3Functions mTs3Functions; - bool succesful = false; + int brightness = 80; void sendColor(int R, int G, int B, int W, int t); }; diff --git a/src/plugin.cpp b/src/plugin.cpp index f0dd212..3570ae7 100644 --- a/src/plugin.cpp +++ b/src/plugin.cpp @@ -635,6 +635,8 @@ void ts3plugin_onConnectStatusChangeEvent(uint64 serverConnectionHandlerID, int size_t i; unsigned int error; + mLedHandler->connected(); + /* Print clientlib version */ if(ts3Functions.getClientLibVersion(&s) == ERROR_ok) { printf("PLUGIN: Client lib version: %s\n", s); @@ -713,40 +715,13 @@ void ts3plugin_onConnectStatusChangeEvent(uint64 serverConnectionHandlerID, int } ts3Functions.freeMemory(ids); myClientID = myID; + } else if (newStatus == STATUS_DISCONNECTED) { + mLedHandler->disconnected(); } } -void ts3plugin_onNewChannelEvent(uint64 serverConnectionHandlerID, uint64 channelID, uint64 channelParentID) { -} - -void ts3plugin_onNewChannelCreatedEvent(uint64 serverConnectionHandlerID, uint64 channelID, uint64 channelParentID, anyID invokerID, const char* invokerName, const char* invokerUniqueIdentifier) { -} - -void ts3plugin_onDelChannelEvent(uint64 serverConnectionHandlerID, uint64 channelID, anyID invokerID, const char* invokerName, const char* invokerUniqueIdentifier) { -} - -void ts3plugin_onChannelMoveEvent(uint64 serverConnectionHandlerID, uint64 channelID, uint64 newChannelParentID, anyID invokerID, const char* invokerName, const char* invokerUniqueIdentifier) { -} - -void ts3plugin_onUpdateChannelEvent(uint64 serverConnectionHandlerID, uint64 channelID) { -} - -void ts3plugin_onUpdateChannelEditedEvent(uint64 serverConnectionHandlerID, uint64 channelID, anyID invokerID, const char* invokerName, const char* invokerUniqueIdentifier) { -} - -void ts3plugin_onUpdateClientEvent(uint64 serverConnectionHandlerID, anyID clientID, anyID invokerID, const char* invokerName, const char* invokerUniqueIdentifier) { -} - void ts3plugin_onClientMoveEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility, const char* moveMessage) { -} - -void ts3plugin_onClientMoveSubscriptionEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility) { -} - -void ts3plugin_onClientMoveTimeoutEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility, const char* timeoutMessage) { -} - -void ts3plugin_onClientMoveMovedEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility, anyID moverID, const char* moverName, const char* moverUniqueIdentifier, const char* moveMessage) { + mLedHandler->clientMoved(); } void ts3plugin_onClientKickFromChannelEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility, anyID kickerID, const char* kickerName, const char* kickerUniqueIdentifier, const char* kickMessage) { @@ -755,33 +730,6 @@ void ts3plugin_onClientKickFromChannelEvent(uint64 serverConnectionHandlerID, an void ts3plugin_onClientKickFromServerEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility, anyID kickerID, const char* kickerName, const char* kickerUniqueIdentifier, const char* kickMessage) { } -void ts3plugin_onClientIDsEvent(uint64 serverConnectionHandlerID, const char* uniqueClientIdentifier, anyID clientID, const char* clientName) { -} - -void ts3plugin_onClientIDsFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onServerEditedEvent(uint64 serverConnectionHandlerID, anyID editerID, const char* editerName, const char* editerUniqueIdentifier) { -} - -void ts3plugin_onServerUpdatedEvent(uint64 serverConnectionHandlerID) { -} - -int ts3plugin_onServerErrorEvent(uint64 serverConnectionHandlerID, const char* errorMessage, unsigned int error, const char* returnCode, const char* extraMessage) { - printf("PLUGIN: onServerErrorEvent %llu %s %d %s\n", (long long unsigned int)serverConnectionHandlerID, errorMessage, error, (returnCode ? returnCode : "")); - if(returnCode) { - /* A plugin could now check the returnCode with previously (when calling a function) remembered returnCodes and react accordingly */ - /* In case of using a a plugin return code, the plugin can return: - * 0: Client will continue handling this error (print to chat tab) - * 1: Client will ignore this error, the plugin announces it has handled it */ - return 1; - } - return 0; /* If no plugin return code was used, the return value of this function is ignored */ -} - -void ts3plugin_onServerStopEvent(uint64 serverConnectionHandlerID, const char* shutdownMessage) { -} - int ts3plugin_onTextMessageEvent(uint64 serverConnectionHandlerID, anyID targetMode, anyID toID, anyID fromID, const char* fromName, const char* fromUniqueIdentifier, const char* message, int ffIgnored) { printf("PLUGIN: onTextMessageEvent %llu %d %d %s %s %d\n", (long long unsigned int)serverConnectionHandlerID, targetMode, fromID, fromName, message, ffIgnored); @@ -821,62 +769,6 @@ void ts3plugin_onTalkStatusChangeEvent(uint64 serverConnectionHandlerID, int sta } } -void ts3plugin_onConnectionInfoEvent(uint64 serverConnectionHandlerID, anyID clientID) { -} - -void ts3plugin_onServerConnectionInfoEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onChannelSubscribeEvent(uint64 serverConnectionHandlerID, uint64 channelID) { -} - -void ts3plugin_onChannelSubscribeFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onChannelUnsubscribeEvent(uint64 serverConnectionHandlerID, uint64 channelID) { -} - -void ts3plugin_onChannelUnsubscribeFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onChannelDescriptionUpdateEvent(uint64 serverConnectionHandlerID, uint64 channelID) { -} - -void ts3plugin_onChannelPasswordChangedEvent(uint64 serverConnectionHandlerID, uint64 channelID) { -} - -void ts3plugin_onPlaybackShutdownCompleteEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onSoundDeviceListChangedEvent(const char* modeID, int playOrCap) { -} - -void ts3plugin_onEditPlaybackVoiceDataEvent(uint64 serverConnectionHandlerID, anyID clientID, short* samples, int sampleCount, int channels) { -} - -void ts3plugin_onEditPostProcessVoiceDataEvent(uint64 serverConnectionHandlerID, anyID clientID, short* samples, int sampleCount, int channels, const unsigned int* channelSpeakerArray, unsigned int* channelFillMask) { -} - -void ts3plugin_onEditMixedPlaybackVoiceDataEvent(uint64 serverConnectionHandlerID, short* samples, int sampleCount, int channels, const unsigned int* channelSpeakerArray, unsigned int* channelFillMask) { -} - -void ts3plugin_onEditCapturedVoiceDataEvent(uint64 serverConnectionHandlerID, short* samples, int sampleCount, int channels, int* edited) { -} - -void ts3plugin_onCustom3dRolloffCalculationClientEvent(uint64 serverConnectionHandlerID, anyID clientID, float distance, float* volume) { -} - -void ts3plugin_onCustom3dRolloffCalculationWaveEvent(uint64 serverConnectionHandlerID, uint64 waveHandle, float distance, float* volume) { -} - -void ts3plugin_onUserLoggingMessageEvent(const char* logMessage, int logLevel, const char* logChannel, uint64 logID, const char* logTime, const char* completeLogString) { -} - -/* Clientlib rare */ - -void ts3plugin_onClientBanFromServerEvent(uint64 serverConnectionHandlerID, anyID clientID, uint64 oldChannelID, uint64 newChannelID, int visibility, anyID kickerID, const char* kickerName, const char* kickerUniqueIdentifier, uint64 time, const char* kickMessage) { -} - int ts3plugin_onClientPokeEvent(uint64 serverConnectionHandlerID, anyID fromClientID, const char* pokerName, const char* pokerUniqueIdentity, const char* message, int ffIgnored) { printf("PLUGIN onClientPokeEvent: %llu %d %s %s %d\n", (long long unsigned int)serverConnectionHandlerID, fromClientID, pokerName, message, ffIgnored); @@ -889,130 +781,9 @@ int ts3plugin_onClientPokeEvent(uint64 serverConnectionHandlerID, anyID fromClie return 0; /* 0 = handle normally, 1 = client will ignore the poke */ } -void ts3plugin_onClientSelfVariableUpdateEvent(uint64 serverConnectionHandlerID, int flag, const char* oldValue, const char* newValue) { -} - -void ts3plugin_onFileListEvent(uint64 serverConnectionHandlerID, uint64 channelID, const char* path, const char* name, uint64 size, uint64 datetime, int type, uint64 incompletesize, const char* returnCode) { -} - -void ts3plugin_onFileListFinishedEvent(uint64 serverConnectionHandlerID, uint64 channelID, const char* path) { -} - -void ts3plugin_onFileInfoEvent(uint64 serverConnectionHandlerID, uint64 channelID, const char* name, uint64 size, uint64 datetime) { -} - -void ts3plugin_onServerGroupListEvent(uint64 serverConnectionHandlerID, uint64 serverGroupID, const char* name, int type, int iconID, int saveDB) { -} - -void ts3plugin_onServerGroupListFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onServerGroupByClientIDEvent(uint64 serverConnectionHandlerID, const char* name, uint64 serverGroupList, uint64 clientDatabaseID) { -} - -void ts3plugin_onServerGroupPermListEvent(uint64 serverConnectionHandlerID, uint64 serverGroupID, unsigned int permissionID, int permissionValue, int permissionNegated, int permissionSkip) { -} - -void ts3plugin_onServerGroupPermListFinishedEvent(uint64 serverConnectionHandlerID, uint64 serverGroupID) { -} - -void ts3plugin_onServerGroupClientListEvent(uint64 serverConnectionHandlerID, uint64 serverGroupID, uint64 clientDatabaseID, const char* clientNameIdentifier, const char* clientUniqueID) { -} - -void ts3plugin_onChannelGroupListEvent(uint64 serverConnectionHandlerID, uint64 channelGroupID, const char* name, int type, int iconID, int saveDB) { -} - -void ts3plugin_onChannelGroupListFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onChannelGroupPermListEvent(uint64 serverConnectionHandlerID, uint64 channelGroupID, unsigned int permissionID, int permissionValue, int permissionNegated, int permissionSkip) { -} - -void ts3plugin_onChannelGroupPermListFinishedEvent(uint64 serverConnectionHandlerID, uint64 channelGroupID) { -} - -void ts3plugin_onChannelPermListEvent(uint64 serverConnectionHandlerID, uint64 channelID, unsigned int permissionID, int permissionValue, int permissionNegated, int permissionSkip) { -} - -void ts3plugin_onChannelPermListFinishedEvent(uint64 serverConnectionHandlerID, uint64 channelID) { -} - -void ts3plugin_onClientPermListEvent(uint64 serverConnectionHandlerID, uint64 clientDatabaseID, unsigned int permissionID, int permissionValue, int permissionNegated, int permissionSkip) { -} - -void ts3plugin_onClientPermListFinishedEvent(uint64 serverConnectionHandlerID, uint64 clientDatabaseID) { -} - -void ts3plugin_onChannelClientPermListEvent(uint64 serverConnectionHandlerID, uint64 channelID, uint64 clientDatabaseID, unsigned int permissionID, int permissionValue, int permissionNegated, int permissionSkip) { -} - -void ts3plugin_onChannelClientPermListFinishedEvent(uint64 serverConnectionHandlerID, uint64 channelID, uint64 clientDatabaseID) { -} - -void ts3plugin_onClientChannelGroupChangedEvent(uint64 serverConnectionHandlerID, uint64 channelGroupID, uint64 channelID, anyID clientID, anyID invokerClientID, const char* invokerName, const char* invokerUniqueIdentity) { -} - -int ts3plugin_onServerPermissionErrorEvent(uint64 serverConnectionHandlerID, const char* errorMessage, unsigned int error, const char* returnCode, unsigned int failedPermissionID) { - return 0; /* See onServerErrorEvent for return code description */ -} - -void ts3plugin_onPermissionListGroupEndIDEvent(uint64 serverConnectionHandlerID, unsigned int groupEndID) { -} - -void ts3plugin_onPermissionListEvent(uint64 serverConnectionHandlerID, unsigned int permissionID, const char* permissionName, const char* permissionDescription) { -} - -void ts3plugin_onPermissionListFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onPermissionOverviewEvent(uint64 serverConnectionHandlerID, uint64 clientDatabaseID, uint64 channelID, int overviewType, uint64 overviewID1, uint64 overviewID2, unsigned int permissionID, int permissionValue, int permissionNegated, int permissionSkip) { -} - -void ts3plugin_onPermissionOverviewFinishedEvent(uint64 serverConnectionHandlerID) { -} - -void ts3plugin_onServerGroupClientAddedEvent(uint64 serverConnectionHandlerID, anyID clientID, const char* clientName, const char* clientUniqueIdentity, uint64 serverGroupID, anyID invokerClientID, const char* invokerName, const char* invokerUniqueIdentity) { -} - -void ts3plugin_onServerGroupClientDeletedEvent(uint64 serverConnectionHandlerID, anyID clientID, const char* clientName, const char* clientUniqueIdentity, uint64 serverGroupID, anyID invokerClientID, const char* invokerName, const char* invokerUniqueIdentity) { -} - -void ts3plugin_onClientNeededPermissionsEvent(uint64 serverConnectionHandlerID, unsigned int permissionID, int permissionValue) { -} - -void ts3plugin_onClientNeededPermissionsFinishedEvent(uint64 serverConnectionHandlerID) { -} - void ts3plugin_onFileTransferStatusEvent(anyID transferID, unsigned int status, const char* statusMessage, uint64 remotefileSize, uint64 serverConnectionHandlerID) { } -void ts3plugin_onClientChatClosedEvent(uint64 serverConnectionHandlerID, anyID clientID, const char* clientUniqueIdentity) { -} - -void ts3plugin_onClientChatComposingEvent(uint64 serverConnectionHandlerID, anyID clientID, const char* clientUniqueIdentity) { -} - -void ts3plugin_onServerLogEvent(uint64 serverConnectionHandlerID, const char* logMsg) { -} - -void ts3plugin_onServerLogFinishedEvent(uint64 serverConnectionHandlerID, uint64 lastPos, uint64 fileSize) { -} - -void ts3plugin_onMessageListEvent(uint64 serverConnectionHandlerID, uint64 messageID, const char* fromClientUniqueIdentity, const char* subject, uint64 timestamp, int flagRead) { -} - -void ts3plugin_onMessageGetEvent(uint64 serverConnectionHandlerID, uint64 messageID, const char* fromClientUniqueIdentity, const char* subject, const char* message, uint64 timestamp) { -} - -void ts3plugin_onClientDBIDfromUIDEvent(uint64 serverConnectionHandlerID, const char* uniqueClientIdentifier, uint64 clientDatabaseID) { -} - -void ts3plugin_onClientNamefromUIDEvent(uint64 serverConnectionHandlerID, const char* uniqueClientIdentifier, uint64 clientDatabaseID, const char* clientNickName) { -} - -void ts3plugin_onClientNamefromDBIDEvent(uint64 serverConnectionHandlerID, const char* uniqueClientIdentifier, uint64 clientDatabaseID, const char* clientNickName) { -} - void ts3plugin_onComplainListEvent(uint64 serverConnectionHandlerID, uint64 targetClientDatabaseID, const char* targetClientNickName, uint64 fromClientDatabaseID, const char* fromClientNickName, const char* complainReason, uint64 timestamp) { } @@ -1020,19 +791,6 @@ void ts3plugin_onBanListEvent(uint64 serverConnectionHandlerID, uint64 banid, co uint64 invokercldbid, const char* invokeruid, const char* reason, int numberOfEnforcements, const char* lastNickName) { } -void ts3plugin_onClientServerQueryLoginPasswordEvent(uint64 serverConnectionHandlerID, const char* loginPassword) { -} - -void ts3plugin_onPluginCommandEvent(uint64 serverConnectionHandlerID, const char* pluginName, const char* pluginCommand, anyID invokerClientID, const char* invokerName, const char* invokerUniqueIdentity) { - printf("ON PLUGIN COMMAND: %s %s %d %s %s\n", pluginName, pluginCommand, invokerClientID, invokerName, invokerUniqueIdentity); -} - -void ts3plugin_onIncomingClientQueryEvent(uint64 serverConnectionHandlerID, const char* commandText) { -} - -void ts3plugin_onServerTemporaryPasswordListEvent(uint64 serverConnectionHandlerID, const char* clientNickname, const char* uniqueClientIdentifier, const char* description, const char* password, uint64 timestampStart, uint64 timestampEnd, uint64 targetChannelID, const char* targetChannelPW) { -} - /* Client UI callbacks */ /* @@ -1135,7 +893,3 @@ const char* ts3plugin_keyPrefix() { return NULL; } -/* Called when client custom nickname changed */ -void ts3plugin_onClientDisplayNameChanged(uint64 serverConnectionHandlerID, anyID clientID, const char* displayName, const char* uniqueClientIdentifier) { -} -