sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-28 16:12:24 +01:00
Code Issues Releases Wiki Activity

Merge branch 'event_emitter_vector' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-26 10:32:13 -05:00
parent bbcdf140bb 2b0af0df84
commit 63d690fb8d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
esphome/components/event_emitter/event_emitter.h
View File

@@ -69,6 +69,16 @@ template<typename EvtType, typename... Args> class EventEmitter {
std::vector<Listener> listeners; std::vector<Listener> listeners;
}; };
EventEmitterListenerID get_next_id_() {
// Simple incrementing ID, wrapping around at max
EventEmitterListenerID next_id = (this->current_id_ + 1);
if (next_id == INVALID_LISTENER_ID) {
next_id = 1;
}
this->current_id_ = next_id;
return this->current_id_;
}
EventEntry *find_event_(EvtType event) { EventEntry *find_event_(EvtType event) {
for (auto &entry : this->events_) { for (auto &entry : this->events_) {
if (entry.event == event) { if (entry.event == event) {
@@ -99,16 +109,6 @@ template<typename EvtType, typename... Args> class EventEmitter {
} }
} }
EventEmitterListenerID get_next_id_() {
// Simple incrementing ID, wrapping around at max
EventEmitterListenerID next_id = (this->current_id_ + 1);
if (next_id == 0) { // Skip 0 as it's often used as "invalid"
next_id = 1;
}
this->current_id_ = next_id;
return this->current_id_;
}
std::vector<EventEntry> events_; std::vector<EventEntry> events_;
EventEmitterListenerID current_id_ = 0; EventEmitterListenerID current_id_ = 0;
}; };