Merge pull request #528 from nomis52/libusb

Refactor the libusb plugin so we can use asynchronous I/O
OpenLightingProject · Nov 29, 2014 · a81dc3e · a81dc3e
2 parents 2835b1d + a0d6480
commit a81dc3e
Show file tree

Hide file tree

Showing 27 changed files with 43 additions and 1,866 deletions.
diff --git a/common/utils/DmxBuffer.cpp b/common/utils/DmxBuffer.cpp
@@ -261,6 +261,11 @@ void DmxBuffer::Get(uint8_t *data, unsigned int *length) const {
 
 void DmxBuffer::GetRange(unsigned int slot, uint8_t *data,
                          unsigned int *length) const {
+  if (slot >= m_length) {
+    *length = 0;
+    return;
+  }
+
   if (m_data) {
     *length = min(*length, m_length - slot);
     memcpy(data, m_data + slot, *length);

diff --git a/plugins/usbdmx/AnymaDevice.cpp b/plugins/usbdmx/AnymaDevice.cpp
diff --git a/plugins/usbdmx/AnymaDevice.h b/plugins/usbdmx/AnymaDevice.h
diff --git a/plugins/usbdmx/AnymaOutputPort.cpp b/plugins/usbdmx/AnymaOutputPort.cpp
diff --git a/plugins/usbdmx/AnymaOutputPort.h b/plugins/usbdmx/AnymaOutputPort.h