#315 Adds Tuner column to Now Playing channels view (#2668)

Co-authored-by: denny <dennis.sheirer@gmail.com>
This commit is contained in:
Denny Sheirer
2026-11-16 03:19:28 -05:00
committed by GitHub
parent 0bc5d6db64
commit 5fd469c402
4 changed files with 59 additions and 2 deletions

View File

@@ -40,6 +40,7 @@ import io.github.dsheirer.preference.UserPreferences;
import io.github.dsheirer.preference.identifier.TalkgroupFormatPreference;
import io.github.dsheirer.sample.Broadcaster;
import io.github.dsheirer.sample.Listener;
import io.github.dsheirer.source.tuner.channel.TunerChannelSource;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
@@ -356,6 +357,10 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
frequency.setCellFactory(NowPlayingCells.formatted(value -> frequencyFormat.format(value / 1e6d)));
columns.add(frequency);
//Tuner that sources the channel
columns.add(NowPlayingCells.column("tuner", "Tuner", null, Pos.CENTER,
row -> getTunerName(row.getChannelMetadata()), Row::revisionProperty));
columns.add(NowPlayingCells.column("channel.name", "Channel Name", null, Pos.CENTER,
row -> toText(row.getChannelMetadata().getChannelNameConfigurationIdentifier()), Row::revisionProperty));
@@ -365,7 +370,7 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
column.setSortable(false);
}
//Column numbers in the Swing version of the table, for its stored column widths. Talker is a new column.
//Column numbers in the Swing version of the table, for its stored column widths. Talker and Tuner are new columns.
String[] swingColumns = {"status", "decoder", "from", "from.alias", "to", "to.alias", "channel", "frequency",
"channel.name"};
@@ -382,6 +387,22 @@ public class ChannelMetadataView extends VBox implements ChannelMetadataModel.Li
return columns;
}
/**
* Name of the tuner that sources the channel, or null if the channel isn't sourced by a tuner.
*/
private String getTunerName(ChannelMetadata channelMetadata)
{
Channel channel = mChannelMetadataModel.getChannelFromMetadata(channelMetadata);
ProcessingChain processingChain = channel != null ? mChannelProcessingManager.getProcessingChain(channel) : null;
if(processingChain != null && processingChain.getSource() instanceof TunerChannelSource tunerChannelSource)
{
return tunerChannelSource.getTunerName();
}
return null;
}
/**
* Decoder logical channel name with the timeslot, if any
*/

View File

@@ -47,7 +47,7 @@ public class MultiFrequencyTunerChannelSource extends TunerChannelSource
private final static Logger mLog = LoggerFactory.getLogger(MultiFrequencyTunerChannelSource.class);
private TunerManager mTunerManager;
private TunerChannelSource mTunerChannelSource;
private volatile TunerChannelSource mTunerChannelSource;
private List<Long> mFrequencies;
private List<Long> mLockedFrequencies = new ArrayList<>();
private int mFrequencyListPointer = 0;
@@ -73,6 +73,17 @@ public class MultiFrequencyTunerChannelSource extends TunerChannelSource
mPreferredTuner = preferredTuner;
}
/**
* Name of the tuner that provides the current frequency's tuner channel source, which can change as the
* frequencies rotate.
*/
@Override
public String getTunerName()
{
TunerChannelSource source = mTunerChannelSource;
return source != null ? source.getTunerName() : null;
}
/**
* Applies the channel decoder requested frequency correction.
* @param correction requested by the downstream processors.

View File

@@ -41,6 +41,7 @@ public abstract class TunerChannelSource extends ComplexSource implements ISourc
protected String mThreadName;
private final ChannelFrequencyErrorManager mChannelFrequencyErrorManager;
private volatile long mStartTimestamp;
private volatile String mTunerName;
/**
* Tuner Channel Source is a Digital Drop Channel (DDC) abstract class that defines the minimum functionality
@@ -112,6 +113,24 @@ public abstract class TunerChannelSource extends ComplexSource implements ISourc
return mTunerChannel;
}
/**
* Name of the tuner that provides this channel source.
* @return preferred name of the tuner or null if not set
*/
public String getTunerName()
{
return mTunerName;
}
/**
* Sets the name of the tuner that provides this channel source.
* @param tunerName preferred name of the tuner
*/
public void setTunerName(String tunerName)
{
mTunerName = tunerName;
}
/**
* Sets the timestamp for the oldest samples to provide to this channel when it starts. This only applies to
* sources where the producer incorporates a sample delay buffer.

View File

@@ -655,6 +655,7 @@ public class TunerManager implements IDiscoveredTunerStatusListener
if(source != null)
{
source.setTunerName(discoveredTuner.getTuner().getPreferredName());
return source;
}
}
@@ -680,6 +681,11 @@ public class TunerManager implements IDiscoveredTunerStatusListener
{
source = discoveredTuner.getTuner().getChannelSourceManager().getSource(tunerChannel,
channelSpecification, threadName);
if(source != null)
{
source.setTunerName(discoveredTuner.getTuner().getPreferredName());
}
}
catch(Exception e)
{