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

Jump to bottom

Master resync #1971

Merged
merged 10 commits into from
Sep 22, 2024
Merged

Master resync #1971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
faaf2a5
Correct a comment's instructions
peternewman Mar 30, 2024
e083653
Fix liblo 0.32 header compatibility
cbix Mar 30, 2024
578b2fb
Merge pull request #1954 from cbix/fix/liblo-032
peternewman Apr 2, 2024
8966a25
Fix a comment typo
peternewman Apr 21, 2024
d561605
Fix the formatting of some PID values in some Python exceptions
peternewman Apr 21, 2024
4828ff3
Merge branch '0.10' of https://github.com/openlightingproject/ola int…
peternewman Apr 21, 2024
df08473
Merge pull request #1961 from peternewman/0.10-clang-latest
peternewman Apr 26, 2024
25c3690
Merge branch '0.10' of https://github.com/openlightingproject/ola int…
peternewman Aug 20, 2024
a04b56e
Merge branch 'master' into master-resync
peternewman Sep 13, 2024
1122621
Add another manufacturer name to ignore
peternewman Sep 22, 2024
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
1 change: 1 addition & 0 deletions .codespellignorelines
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion common/protocol/Ola.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions plugins/osc/OSCNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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(
Expand Down
Loading