X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bmusb.cpp;h=cd4e59c4302b5d6cdba09080cd4b36c7337e7c2a;hb=d51fd416b5c2784b03ae50bda59cd01a881bf7df;hp=fd323a66ffc42bc8a025ba4e6353f7e7a6c37acd;hpb=28c6df233b806a580281eb1ae242fa108af3eb09;p=bmusb

diff --git a/bmusb.cpp b/bmusb.cpp
index fd323a6..cd4e59c 100644
--- a/bmusb.cpp
+++ b/bmusb.cpp
@@ -878,7 +878,8 @@ void BMUSBCapture::usb_thread_func()
 		printf("couldn't set realtime priority for USB thread: %s\n", strerror(errno));
 	}
 	while (!should_quit) {
-		int rc = libusb_handle_events(nullptr);
+		timeval sec { 1, 0 };
+		int rc = libusb_handle_events_timeout(nullptr, &sec);
 		if (rc != LIBUSB_SUCCESS)
 			break;
 	}
@@ -1011,10 +1012,16 @@ libusb_device_handle *open_card(unsigned card_index, libusb_device *dev, string
 
 }  // namespace
 
-int BMUSBCapture::num_cards()
+unsigned BMUSBCapture::num_cards()
 {
+	int rc = libusb_init(nullptr);
+	if (rc < 0) {
+		fprintf(stderr, "Error initializing libusb: %s\n", libusb_error_name(rc));
+		exit(1);
+	}
+
 	vector<USBCardDevice> found_cards = find_all_cards();
-	int ret = found_cards.size();
+	unsigned ret = found_cards.size();
 	for (size_t i = 0; i < found_cards.size(); ++i) {
 		libusb_unref_device(found_cards[i].device);
 	}