removed QueueList.h

using std::queue instead

Author: sivar2311

changelog.md

@@ -1,4 +1,13 @@
 # Changelog
+## Version 2.7.6
+- Internal changes
+  removed QueueList.h and use std::queue instead
+
+## Version 2.7.5
+- New Examples 
+  - Examples / Light / RGB_LED_Stripe_5050
+  - Examples / Switch / Relay
+
 ## Version 2.7.4
 - New
   - Speaker & TV `onAdjustVolume` callback changed:

library.json

@@ -13,7 +13,7 @@
       "maintainer": true
     }
   ],
-  "version": "2.7.5",
+  "version": "2.7.6",
   "frameworks": "arduino",
   "platforms": [
     "espressif8266",

library.properties

@@ -1,5 +1,5 @@
 name=SinricPro
-version=2.7.5
+version=2.7.6
 author=Boris Jaeger <[email protected]>
 maintainer=Boris Jaeger <[email protected]>
 sentence=Library for https://sinric.pro - simple way to connect your device to alexa

src/SinricPro.h

@@ -324,11 +324,12 @@ void SinricProClass::handleRequest(DynamicJsonDocument& requestMessage, interfac
 }
 
 void SinricProClass::handleReceiveQueue() {
-  if (receiveQueue.count() == 0) return;
+  if (receiveQueue.size() == 0) return;
 
-  DEBUG_SINRIC("[SinricPro.handleReceiveQueue()]: %i message(s) in receiveQueue\r\n", receiveQueue.count());
-  while (receiveQueue.count() > 0) {
-    SinricProMessage* rawMessage = receiveQueue.pop();
+  DEBUG_SINRIC("[SinricPro.handleReceiveQueue()]: %i message(s) in receiveQueue\r\n", receiveQueue.size());
+  while (receiveQueue.size() > 0) {
+    SinricProMessage* rawMessage = receiveQueue.front();
+    receiveQueue.pop();
     DynamicJsonDocument jsonMessage(1024);
     deserializeJson(jsonMessage, rawMessage->getMessage());
 
@@ -357,11 +358,11 @@ void SinricProClass::handleReceiveQueue() {
 void SinricProClass::handleSendQueue() {
   if (!isConnected()) return;
   if (!baseTimestamp) return;
-  while (sendQueue.count() > 0) {
-    DEBUG_SINRIC("[SinricPro:handleSendQueue()]: %i message(s) in sendQueue\r\n", sendQueue.count());
+  while (sendQueue.size() > 0) {
+    DEBUG_SINRIC("[SinricPro:handleSendQueue()]: %i message(s) in sendQueue\r\n", sendQueue.size());
     DEBUG_SINRIC("[SinricPro:handleSendQueue()]: Sending message...\r\n");
 
-    SinricProMessage* rawMessage = sendQueue.pop();
+    SinricProMessage* rawMessage = sendQueue.front(); sendQueue.pop();
 
     DynamicJsonDocument jsonMessage(1024);
     deserializeJson(jsonMessage, rawMessage->getMessage());

src/SinricProConfig.h

@@ -25,7 +25,7 @@
 // Version Configuration
 #define SINRICPRO_VERSION_MAJOR     2
 #define SINRICPRO_VERSION_MINOR     7
-#define SINRICPRO_VERSION_REVISION  5
+#define SINRICPRO_VERSION_REVISION  6
 #define SINRICPRO_VERSION STR(SINRICPRO_VERSION_MAJOR) "." STR(SINRICPRO_VERSION_MINOR) "." STR(SINRICPRO_VERSION_REVISION)
 #define SINRICPRO_VERSION_STR "SinricPro (v" SINRICPRO_VERSION ")"
 

src/SinricProQueue.h

@@ -8,8 +8,7 @@
 #ifndef __SINRICPRO_QUEUE_H__
 #define __SINRICPRO_QUEUE_H__
 
-#include "extralib/QueueList/QueueList.h"
-
+#include <queue>
 
 typedef enum {
   IF_UNKNOWN    = 0,
@@ -19,15 +18,33 @@ typedef enum {
 
 class SinricProMessage {
 public:
-  SinricProMessage(interface_t interface, const char* message) : _interface(interface) { _message = strdup(message); };
-  ~SinricProMessage() { if (_message) free(_message); };
-  const char* getMessage() { return _message; };
-  interface_t getInterface() { return _interface; };
+  SinricProMessage(interface_t interface, const char* message);
+  ~SinricProMessage();
+  const char* getMessage() const;
+  interface_t getInterface() const;
 private:
   interface_t _interface;
   char* _message;
 };
 
-typedef QueueList<SinricProMessage*> SinricProQueue_t;
+SinricProMessage::SinricProMessage(interface_t interface, const char* message) : 
+  _interface(interface) { 
+  _message = strdup(message); 
+};
+
+SinricProMessage::~SinricProMessage() { 
+  if (_message) free(_message); 
+};
+
+const char* SinricProMessage::getMessage() const { 
+  return _message; 
+};
+
+interface_t SinricProMessage::getInterface() const { 
+  return _interface; 
+};
+
+
+typedef std::queue<SinricProMessage*> SinricProQueue_t;
 
 #endif