Skip to content
Permalink
Browse files

Merge branch 'master' into fix-get-dimmer-max

  • Loading branch information...
peternewman committed Jun 20, 2019
2 parents 106db2b + c9a4595 commit 81d7b21108e72f3d1c8856f3d309bdbf7ee8ced8
@@ -61,10 +61,12 @@ const uint8_t BaseRobeWidget::SOM;
$scope.input(' THRU ');
manufacturer_name: "ALS Stanislaw Binkiewicz"
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: "SRM Technik GmbH"
manufacturer_name: "medien technik cords"
manufacturer_name: "TBE Srl"
manufacturer_name: "AUTOLUX Handels- und ProduktionsgmbH"
STLDeleteValues(&m_uint_map_variables);
return GetMapVar(&m_uint_map_variables, name, label);
STLValues(m_uint_map_variables, &variables);
@@ -171,3 +173,7 @@ 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();
# This is a very bodgy workaround to the fact that the pip install of the archive doesn't seem to work properly now on Travis
@@ -213,13 +213,15 @@ matrix:
- os: linux
dist: xenial
env: TASK='pychecker'
python: '2.7'
addons:
apt:
packages:
- *base_build
- os: linux
dist: xenial
env: TASK='pychecker-wip'
python: '2.7'
addons:
apt:
packages:
@@ -236,6 +238,7 @@ matrix:
- os: linux
dist: xenial
env: TASK='pychecker-wip'
python: '2.7'
- os: linux
dist: xenial
env: TASK='spellintian'
@@ -288,7 +291,9 @@ install:
- if [ "$TASK" = "codespell" ]; then pip install --user git+https://github.com/codespell-project/codespell.git; fi
- if [ "$TASK" = "jshint" ]; then npm install -g grunt-cli; fi
# If this causes SSL errors, then Sourceforge is probably in disaster recovery mode and needing Javascript. Could switch to a specific mirror, e.g. kent.dl.sourceforge.net
- if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then sudo pip install http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
- if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then pip install --user http://sourceforge.net/projects/pychecker/files/pychecker/0.8.19/pychecker-0.8.19.tar.gz/download; fi
# This is a very bodgy workaround to the fact that the pip install of the archive doesn't seem to work properly now on Travis
- if [ "$TASK" = "pychecker" -o "$TASK" = "pychecker-wip" ]; then sudo mkdir -p /pychecker/; sudo ln -s /home/travis/.local/lib/python2.7/site-packages/pychecker/checker.py /pychecker/checker.py; fi

before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
@@ -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) {
@@ -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()
@@ -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
*/

@@ -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*);
@@ -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,
@@ -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
@@ -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;
@@ -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);
@@ -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();
}


@@ -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;

0 comments on commit 81d7b21

Please sign in to comment.
You can’t perform that action at this time.