Add a printer factory to simplify construction of printer drivers (#11)

Co-authored-by: Moritz Martinius <mm@cloudprinters.de>
Reviewed-on: moritz/ptouch-prnt#11

src/libusbwrap/LibUsbTypes.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <memory>
+#include <utility>
 
 #include "libusb.h"
 
@@ -40,4 +40,7 @@ enum class Error {
     NOT_SUPPORTED = LIBUSB_ERROR_NOT_SUPPORTED,
     OTHER         = LIBUSB_ERROR_OTHER
 };
-}
+
+using usbId = std::pair<uint16_t, uint16_t>;
+
+}  // namespace libusbwrap

src/libusbwrap/UsbDevice.cpp

@@ -104,12 +104,8 @@ bool UsbDevice::bulkTransfer(uint8_t endpoint, std::vector<uint8_t>& data, int*
     return true;
 }
 
-const uint16_t UsbDevice::getVid() {
-    return mLibusbDevDesc.idVendor;
-}
-
-const uint16_t UsbDevice::getPid() {
-    return mLibusbDevDesc.idProduct;
+const usbId UsbDevice::getUsbId() {
+    return {mLibusbDevDesc.idVendor, mLibusbDevDesc.idProduct};
 }
 
 const device::Speed UsbDevice::getSpeed() {

src/libusbwrap/UsbDevice.hpp

@@ -47,8 +47,7 @@ class UsbDevice : public IUsbDevice {
                       unsigned int timeout) override;
 
     // getters
-    const uint16_t getVid() override;
-    const uint16_t getPid() override;
+    const usbId getUsbId() override;
     const device::Speed getSpeed() override;
     const uint8_t getBusNumber() override;
     const uint8_t getPortNumber() override;

src/libusbwrap/interface/IUsbDevice.hpp

@@ -36,8 +36,7 @@ class IUsbDevice {
                               unsigned int timeout)  = 0;
 
     // getters
-    virtual const uint16_t getVid()        = 0;
-    virtual const uint16_t getPid()        = 0;
+    virtual const usbId getUsbId()         = 0;
     virtual const device::Speed getSpeed() = 0;
     virtual const uint8_t getBusNumber()   = 0;
     virtual const uint8_t getPortNumber()  = 0;