Get Ja Rule working when hotplug isn't present

peternewman · Oct 11, 2015 · 9cad14c · 9cad14c
1 parent 475f24f
commit 9cad14c
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/tools/ja-rule/Makefile.mk b/tools/ja-rule/Makefile.mk
@@ -1,11 +1,9 @@
 if BUILD_JA_RULE
 if !USING_WIN32
-if HAVE_LIBUSB_HOTPLUG_API
 bin_PROGRAMS += tools/ja-rule/ja-rule \
                 tools/ja-rule/ja-rule-controller
 endif
 endif
-endif
 
 tools_ja_rule_ja_rule_SOURCES = \
     tools/ja-rule/USBDeviceManager.cpp \

diff --git a/tools/ja-rule/USBDeviceManager.cpp b/tools/ja-rule/USBDeviceManager.cpp
@@ -43,7 +43,6 @@ using ola::thread::Thread;
 using ola::usb::AsyncronousLibUsbAdaptor;
 using ola::usb::JaRuleWidget;
 using ola::usb::LibUsbAdaptor;
-using ola::usb::LibUsbHotplugThread;
 using ola::usb::USBDeviceID;
 using ola::usb::HotplugAgent;
 using std::auto_ptr;

diff --git a/tools/ja-rule/ja-rule.cpp b/tools/ja-rule/ja-rule.cpp
@@ -485,7 +485,7 @@ class Controller {
 
   bool CheckForWidget() const {
     if (!m_widget) {
-      cout << "Device not present" << endl;
+      cout << "Device not present or device unavailable" << endl;
       return false;
     }
     return true;

diff --git a/tools/rdm/rdm_test_server.py b/tools/rdm/rdm_test_server.py
@@ -110,7 +110,7 @@ def MakeSyncClientCall(self, method, *method_args):
     """
     global args_result
     # TODO(simon): Create our own Event which holds the result args and a
-    # threading.Event object
+    # threading.Event object #948
     event = Event()
 
     def Callback(*args, **kwargs):