Merge pull request #1971 from peternewman/master-resync

Master resync

.codespellignorelines

@@ -65,6 +65,7 @@ const uint8_t BaseRobeWidget::SOM;
   manufacturer_name: "Guangzhou Litewise Lighting Equipments Co., Ltd. dba \"EK Lights\""
   manufacturer_name: "Guangzhou VAS Lighting Co., Ltd."
   manufacturer_name: "ARRI -- Arnold & Richter Cine Technik GmbH & Co. Betriebs KG"
+  manufacturer_name: "MEDIAM Ltd. (Modus brand)"
   manufacturer_name: "SRM Technik GmbH"
   manufacturer_name: "medien technik cords"
   manufacturer_name: "TBE Srl"

common/protocol/Ola.proto

@@ -79,7 +79,7 @@ enum PluginIds {
 }
 
 /**
- * If you add more here be sure to update ResponseCodeToString in RDMHelper.cpp
+ * If you add more here be sure to update StatusCodeToString in RDMHelper.cpp
  */
 enum RDMResponseCode {
   // The request/response completed correctly

plugins/osc/OSCNode.cpp

@@ -141,7 +141,7 @@ bool ExtractSlotValueFromPair(const string &type, lo_arg **argv,
  * @param user_data a pointer to the OSCNode object.
  */
 int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv,
-                   int argc, void *, void *user_data) {
+                   int argc, lo_message, void *user_data) {
   OLA_DEBUG << "Got OSC message for " << osc_address << ", types are " << types;
 
   OSCNode *node = reinterpret_cast<OSCNode*>(user_data);
@@ -150,7 +150,7 @@ int OSCDataHandler(const char *osc_address, const char *types, lo_arg **argv,
 
   if (argc == 1) {
     if (type == "b") {
-      lo_blob blob = argv[0];
+      lo_blob blob = (lo_blob)argv[0];
       unsigned int size = min(static_cast<uint32_t>(DMX_UNIVERSE_SIZE),
                               lo_blob_datasize(blob));
       node->SetUniverse(