Support multiple cards at the same time (although currently, they have to be of diffe...

[bmusb] / bmusb.h

diff --git a/bmusb.h b/bmusb.h
index e0531c2c3f552543b81b48a225b396e4b7974c67..9b74730cb056721dfa7038fbc1010d0a61e221fb 100644 (file)
--- a/bmusb.h
+++ b/bmusb.h
@@ -8,6 +8,7 @@
 #include <functional>
 #include <mutex>
 #include <thread>
+#include <vector>
 
 // An interface for frame allocators; if you do not specify one
 // (using set_video_frame_allocator), a default one that pre-allocates
@@ -60,6 +61,11 @@ typedef std::function<void(uint16_t timecode,
 // The actual capturing class, representing capture from a single card.
 class BMUSBCapture {
  public:
+       BMUSBCapture(int vid = 0x1edb, int pid = 0xbd3b)
+               : vid(vid), pid(pid)
+       {
+       }
+
        // Does not take ownership.
        void set_video_frame_allocator(FrameAllocator *allocator)
        {
@@ -87,8 +93,11 @@ class BMUSBCapture {
                frame_callback = callback;
        }
 
+       void configure_card();
        void start_bm_capture();
-       void stop_bm_capture();
+
+       static void start_bm_thread();
+       static void stop_bm_thread();
 
  private:
        struct QueuedFrame {
@@ -103,7 +112,7 @@ class BMUSBCapture {
        void queue_frame(uint16_t format, uint16_t timecode, FrameAllocator::Frame frame, std::deque<QueuedFrame> *q);
        void dequeue_thread();
 
-       void usb_thread_func();
+       static void usb_thread_func();
        static void cb_xfr(struct libusb_transfer *xfr);
 
        FrameAllocator::Frame current_video_frame;
@@ -114,9 +123,6 @@ class BMUSBCapture {
        std::deque<QueuedFrame> pending_video_frames;
        std::deque<QueuedFrame> pending_audio_frames;
 
-       std::thread usb_thread;
-       std::atomic<bool> should_quit;
-
        FrameAllocator *video_frame_allocator = nullptr;
        FrameAllocator *audio_frame_allocator = nullptr;
        frame_callback_t frame_callback = nullptr;
@@ -125,6 +131,9 @@ class BMUSBCapture {
 
        static constexpr int NUM_BMUSB_REGISTERS = 60;
        uint8_t register_file[NUM_BMUSB_REGISTERS];
+
+       int vid, pid;
+       std::vector<libusb_transfer *> iso_xfrs;
 };
 
 #endif