diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-03-14 18:11:46 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-03-16 07:58:20 -0700 |
| commit | ec3a968df9d8fc706fedb788959631e2ed84e04b (patch) | |
| tree | aaa56de98ae2a861aef1d9bc2ab78fe05f06f745 /core/downloadfromdcthread.cpp | |
| parent | 1495aa2dbf5366cc135c1ceb959c6a12abbb3e0b (diff) | |
| download | subsurface-ec3a968df9d8fc706fedb788959631e2ed84e04b.tar.gz | |
android/usb: pass in the UsbDevice when downloading
This finally allows us to download from not just the first device, but specifically
the device that the user picks.
Passing the object through a void pointer is not nice - but since this traverses
C code other solutions (like passing an index into the list) seemed even worse.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/downloadfromdcthread.cpp')
| -rw-r--r-- | core/downloadfromdcthread.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index c71a96fd9..2517b7fb6 100644 --- a/core/downloadfromdcthread.cpp +++ b/core/downloadfromdcthread.cpp @@ -220,6 +220,9 @@ DCDeviceData::DCDeviceData() #else data.libdc_log = false; #endif +#if defined(Q_OS_ANDROID) + data.androidUsbDeviceDescriptor = nullptr; +#endif } DCDeviceData *DCDeviceData::instance() @@ -320,6 +323,13 @@ void DCDeviceData::setDevName(const QString &devName) data.devname = copy_qstring(devName); } +#if defined(Q_OS_ANDROID) +void DCDeviceData::setUsbDevice(void *device) +{ + data.androidUsbDeviceDescriptor = device; +} +#endif + void DCDeviceData::setDevBluetoothName(const QString &name) { m_devBluetoothName = name; |