Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
Expand Up @@ -182,3 +182,6 @@ function ok(a,b){for(var c=a.wa[b].data.items,d=c.length,g=N(a.wa[b].id),h="",i=
import java.nio.ByteOrder;
byte[] header = ByteBuffer.allocate(4).order(ByteOrder.nativeOrder()).putInt(headerContent).array();
int headerValue = ByteBuffer.wrap(header).order(ByteOrder.nativeOrder()).getInt();
std::string ErrorString() const;
std::string SchemaErrorLogger::ErrorString() const {
return m_error_logger.ErrorString();
2 changes: 1 addition & 1 deletion common/rdm/StringMessageBuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ void StringMessageBuilder::Visit(


/**
* This is a noop since we handle decending ourselves in Visit()
* This is a no-op since we handle descending ourselves in Visit()
*/
void StringMessageBuilder::PostVisit(
const ola::messaging::FieldDescriptorGroup *descriptor) {
Expand Down
6 changes: 3 additions & 3 deletions include/ola/gen_callbacks.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,17 @@ def main():
Header()

# exec_time : [bind time args]
calback_types = {
callback_types = {
0: [0, 1, 2, 3, 4],
1: [0, 1, 2, 3, 4],
2: [0, 1, 2, 3, 4],
3: [0, 1, 2, 3, 4],
4: [0, 1, 2, 3, 4],
}

for exec_time in sorted(calback_types):
for exec_time in sorted(callback_types):
GenerateBase(exec_time)
for bind_time in calback_types[exec_time]:
for bind_time in callback_types[exec_time]:
GenerateMethodCallback(bind_time, exec_time, is_method=False)
GenerateMethodCallback(bind_time, exec_time)
Footer()
Expand Down
2 changes: 1 addition & 1 deletion include/ola/io/MemoryBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
* MemoryBuffer.h
* An derrived class of InputBuffer that wraps a memory buffer.
* A derived class of InputBuffer that wraps a memory buffer.
* Copyright (C) 2012 Simon Newton
*/

Expand Down
2 changes: 1 addition & 1 deletion include/ola/rdm/MessageDeserializer.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class MessageDeserializer: public ola::messaging::FieldDescriptorVisitor {
const uint8_t *data,
unsigned int length);

// we handle decending into groups ourself
// we handle descending into groups ourself
bool Descend() const { return false; }

void Visit(const ola::messaging::BoolFieldDescriptor*);
Expand Down
2 changes: 1 addition & 1 deletion include/ola/rdm/StringMessageBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class StringMessageBuilder: public ola::messaging::FieldDescriptorVisitor {
StringMessageBuilder();
~StringMessageBuilder();

// we handle decending into groups ourself
// we handle descending into groups ourself
bool Descend() const { return false; }
const ola::messaging::Message *GetMessage(
const std::vector<std::string> &inputs,
Expand Down
4 changes: 2 additions & 2 deletions include/ola/thread/ExecutorInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ class ExecutorInterface {
* - For a given thread, callbacks will be run in the order in which they
* were added.
*
* When queuing callbacks, you ether need to ensure that either:
* When queuing callbacks, you need to ensure that either:
* - The objects used in the callback outlive the ExecutorInterface
* - That the calback is run before the objects are deleted.
* - That the callback is run before the objects are deleted.
*
* To achieve the latter it's common to keep track of the number of
* outstanding callbacks and then call DrainCallbacks() in the destructor
Expand Down
4 changes: 2 additions & 2 deletions include/olad/Plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,15 +69,15 @@ class AbstractPlugin {
/**
* @brief Start the plugin
*
* Calls start_hook() which can be over-ridden by the derrived classes.
* Calls StartHook() which can be overridden by the derived classes.
* @return true if we started ok, false otherwise
*/
virtual bool Start() = 0;

/**
* @brief Stop the plugin
*
* Calls stop_hook() which can be over-ridden by the derrived classes.
* Calls StopHook() which can be overridden by the derived classes.
* @return true on success, false on failure
*/
virtual bool Stop() = 0;
Expand Down
2 changes: 1 addition & 1 deletion include/olad/Universe.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class Universe: public ola::rdm::RDMControllerInterface {
bool SetDMX(const DmxBuffer &buffer);
const DmxBuffer &GetDMX() const { return m_buffer; }

// These are the ports we need to nofity when data changes
// These are the ports we need to notify when data changes
bool AddPort(InputPort *port);
bool AddPort(OutputPort *port);
bool RemovePort(InputPort *port);
Expand Down
10 changes: 5 additions & 5 deletions olad/plugin_api/UniverseStore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,27 +104,27 @@ void UniverseStore::DeleteAll() {
SaveUniverseSettings(iter->second);
delete iter->second;
}
m_deletion_candiates.clear();
m_deletion_candidates.clear();
m_universe_map.clear();
}

void UniverseStore::AddUniverseGarbageCollection(Universe *universe) {
m_deletion_candiates.insert(universe);
m_deletion_candidates.insert(universe);
}

void UniverseStore::GarbageCollectUniverses() {
set<Universe*>::iterator iter;
UniverseMap::iterator map_iter;

for (iter = m_deletion_candiates.begin();
iter != m_deletion_candiates.end(); iter++) {
for (iter = m_deletion_candidates.begin();
iter != m_deletion_candidates.end(); iter++) {
if (!(*iter)->IsActive()) {
SaveUniverseSettings(*iter);
m_universe_map.erase((*iter)->UniverseId());
delete *iter;
}
}
m_deletion_candiates.clear();
m_deletion_candidates.clear();
}


Expand Down
4 changes: 2 additions & 2 deletions olad/plugin_api/UniverseStore.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ class UniverseStore {
Preferences *m_preferences;
ExportMap *m_export_map;
UniverseMap m_universe_map;
std::set<Universe*> m_deletion_candiates; // list of universes we may be
// able to delete
std::set<Universe*> m_deletion_candidates; // list of universes we may be
// able to delete
Clock m_clock;

bool RestoreUniverseSettings(Universe *universe) const;
Expand Down