GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 00:57:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1229 Resolves issue with correctly identifying the port number for USB tuners that is causing some tuners not to be recognized and also generating udev errors when sdrtrunk attempts to start an already started device because it was incorrectly identified. (#1230)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2022-05-03 04:03:18 -04:00
committed by GitHub
parent cbeda19d27
commit 7c32897321
11 changed files with 186 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/github/dsheirer/source/tuner/ui/DiscoveredTunerModel.java
View File

@@ -218,10 +218,10 @@ public class DiscoveredTunerModel extends AbstractTableModel implements Listener
/**
* Indicates if this model currently has the discovered tuner that is plugged into the specified bus and port.
* @param bus number
* @param port number
* @param portAddress number
* @return true if it already has the discovered device
*/
public boolean hasUsbTuner(int bus, int port)
public boolean hasUsbTuner(int bus, String portAddress)
{
boolean hasDevice;
mLock.lock();
@@ -229,7 +229,7 @@ public class DiscoveredTunerModel extends AbstractTableModel implements Listener
try
{
hasDevice = mDiscoveredTuners.stream()
.filter(tuner -> tuner instanceof DiscoveredUSBTuner usbTuner && usbTuner.isAt(bus, port))
.filter(tuner -> tuner instanceof DiscoveredUSBTuner usbTuner && usbTuner.isAt(bus, portAddress))
.findFirst()
.isPresent();
}
@@ -244,9 +244,9 @@ public class DiscoveredTunerModel extends AbstractTableModel implements Listener
/**
* Removes the USB tuner at bus and port number
* @param bus usb
* @param port usb
* @param portAddress usb
*/
public DiscoveredTuner removeUsbTuner(int bus, int port)
public DiscoveredTuner removeUsbTuner(int bus, String portAddress)
{
DiscoveredTuner removed = null;
@@ -256,7 +256,7 @@ public class DiscoveredTunerModel extends AbstractTableModel implements Listener
{
DiscoveredTuner discoveredTuner = mDiscoveredTuners.stream()
.filter(tuner -> tuner instanceof DiscoveredUSBTuner usbTuner &&
usbTuner.isAt(bus, port)).findFirst().get();
usbTuner.isAt(bus, portAddress)).findFirst().get();
if(discoveredTuner != null)
{