From bcde6b81e9bcf04a147a5dc1c3888ce3b0584e0a Mon Sep 17 00:00:00 2001 From: Peter Newman Date: Wed, 8 Mar 2023 13:29:57 +0000 Subject: [PATCH] Fix a typo in the DeviceManager stuff (cherry picked from commit d01494b9c3ff3bdec37b072a9029cdb36126cc61) --- include/ola/e133/DeviceManager.h | 4 ++-- tools/e133/DeviceManager.cpp | 4 ++-- tools/e133/DeviceManagerImpl.cpp | 4 ++-- tools/e133/DeviceManagerImpl.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/ola/e133/DeviceManager.h b/include/ola/e133/DeviceManager.h index 9fada52606..023e8d9f1b 100644 --- a/include/ola/e133/DeviceManager.h +++ b/include/ola/e133/DeviceManager.h @@ -53,7 +53,7 @@ class DeviceManager { * @returns true if the data should be acknowledged, false otherwise. */ typedef ola::Callback3 RDMMesssageCallback; + const string&> RDMMessageCallback; // Run when we acquire designated controller status for a device. typedef ola::Callback1 AcquireDeviceCallback; @@ -66,7 +66,7 @@ class DeviceManager { ~DeviceManager(); // Ownership of the callbacks is transferred. - void SetRDMMessageCallback(RDMMesssageCallback *callback); + void SetRDMMessageCallback(RDMMessageCallback *callback); void SetAcquireDeviceCallback(AcquireDeviceCallback *callback); void SetReleaseDeviceCallback(ReleaseDeviceCallback *callback); diff --git a/tools/e133/DeviceManager.cpp b/tools/e133/DeviceManager.cpp index b91879eddd..3fe1f38874 100644 --- a/tools/e133/DeviceManager.cpp +++ b/tools/e133/DeviceManager.cpp @@ -54,9 +54,9 @@ DeviceManager::~DeviceManager() {} /** * Set the callback to be run when RDMNet data is received from a device. - * @param callback the RDMMesssageCallback to run when data is received. + * @param callback the RDMMessageCallback to run when data is received. */ -void DeviceManager::SetRDMMessageCallback(RDMMesssageCallback *callback) { +void DeviceManager::SetRDMMessageCallback(RDMMessageCallback *callback) { m_impl->SetRDMMessageCallback(callback); } diff --git a/tools/e133/DeviceManagerImpl.cpp b/tools/e133/DeviceManagerImpl.cpp index 86ace1d99c..2e16aa4a94 100644 --- a/tools/e133/DeviceManagerImpl.cpp +++ b/tools/e133/DeviceManagerImpl.cpp @@ -132,9 +132,9 @@ DeviceManagerImpl::~DeviceManagerImpl() { /** * Set the callback to be run when RDMNet data is received from a device. - * @param callback the RDMMesssageCallback to run when data is received. + * @param callback the RDMMessageCallback to run when data is received. */ -void DeviceManagerImpl::SetRDMMessageCallback(RDMMesssageCallback *callback) { +void DeviceManagerImpl::SetRDMMessageCallback(RDMMessageCallback *callback) { m_rdm_callback.reset(callback); } diff --git a/tools/e133/DeviceManagerImpl.h b/tools/e133/DeviceManagerImpl.h index 90bee905ef..5f0c7ad1c4 100644 --- a/tools/e133/DeviceManagerImpl.h +++ b/tools/e133/DeviceManagerImpl.h @@ -70,7 +70,7 @@ class DeviceManagerImpl { * @returns true if the data should be acknowledged, false otherwise. */ typedef ola::Callback3 RDMMesssageCallback; + const string&> RDMMessageCallback; // Run when we acquire designated controller status for a device. typedef ola::Callback1 AcquireDeviceCallback; @@ -83,7 +83,7 @@ class DeviceManagerImpl { ~DeviceManagerImpl(); // Ownership of the callbacks is transferred. - void SetRDMMessageCallback(RDMMesssageCallback *callback); + void SetRDMMessageCallback(RDMMessageCallback *callback); void SetAcquireDeviceCallback(AcquireDeviceCallback *callback); void SetReleaseDeviceCallback(ReleaseDeviceCallback *callback); @@ -98,7 +98,7 @@ class DeviceManagerImpl { DeviceMap; DeviceMap m_device_map; - auto_ptr m_rdm_callback; + auto_ptr m_rdm_callback; auto_ptr m_acquire_device_cb_; auto_ptr m_release_device_cb_;