Skip to content

Commit

Permalink
Fix a typo in the DeviceManager stuff
Browse files Browse the repository at this point in the history
(cherry picked from commit d01494b)
  • Loading branch information
peternewman committed Mar 16, 2024
1 parent 2350a05 commit bcde6b8
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions include/ola/e133/DeviceManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class DeviceManager {
* @returns true if the data should be acknowledged, false otherwise.
*/
typedef ola::Callback3<bool, const IPV4Address&, uint16_t,
const string&> RDMMesssageCallback;
const string&> RDMMessageCallback;

// Run when we acquire designated controller status for a device.
typedef ola::Callback1<void, const IPV4Address&> AcquireDeviceCallback;
Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions tools/e133/DeviceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions tools/e133/DeviceManagerImpl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
6 changes: 3 additions & 3 deletions tools/e133/DeviceManagerImpl.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class DeviceManagerImpl {
* @returns true if the data should be acknowledged, false otherwise.
*/
typedef ola::Callback3<bool, const IPV4Address&, uint16_t,
const string&> RDMMesssageCallback;
const string&> RDMMessageCallback;

// Run when we acquire designated controller status for a device.
typedef ola::Callback1<void, const IPV4Address&> AcquireDeviceCallback;
Expand All @@ -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);

Expand All @@ -98,7 +98,7 @@ class DeviceManagerImpl {
DeviceMap;

DeviceMap m_device_map;
auto_ptr<RDMMesssageCallback> m_rdm_callback;
auto_ptr<RDMMessageCallback> m_rdm_callback;
auto_ptr<AcquireDeviceCallback> m_acquire_device_cb_;
auto_ptr<ReleaseDeviceCallback> m_release_device_cb_;

Expand Down

0 comments on commit bcde6b8

Please sign in to comment.