mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 11:07:35 -05:00
#2676 Alias List optionally tracks radio reference system with optional auto-update for talkgroup alias changes. (#2679)
Co-authored-by: denny <dennis.sheirer@gmail.com>
This commit is contained in:
@@ -24,6 +24,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
|
||||
import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
|
||||
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
|
||||
import io.github.dsheirer.alias.Alias;
|
||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
||||
import io.github.dsheirer.alias.AliasModel;
|
||||
import io.github.dsheirer.audio.broadcast.BroadcastModel;
|
||||
import io.github.dsheirer.controller.channel.Channel.ChannelType;
|
||||
@@ -39,6 +40,7 @@ import io.github.dsheirer.module.log.EventLogManager;
|
||||
import io.github.dsheirer.preference.UserPreferences;
|
||||
import io.github.dsheirer.preference.playlist.PlaylistPreference;
|
||||
import io.github.dsheirer.sample.Listener;
|
||||
import io.github.dsheirer.service.radioreference.AliasListSynchronizer;
|
||||
import io.github.dsheirer.service.radioreference.RadioReference;
|
||||
import io.github.dsheirer.source.tuner.manager.TunerManager;
|
||||
import io.github.dsheirer.util.ThreadPool;
|
||||
@@ -76,6 +78,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
private TunerManager mTunerManager;
|
||||
private UserPreferences mUserPreferences;
|
||||
private RadioReference mRadioReference;
|
||||
private AliasListSynchronizer mAliasListSynchronizer;
|
||||
private AtomicBoolean mPlaylistSavePending = new AtomicBoolean();
|
||||
private ScheduledFuture<?> mPlaylistSaveFuture;
|
||||
private boolean mPlaylistLoading = false;
|
||||
@@ -103,6 +106,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
|
||||
mBroadcastModel = new BroadcastModel(mAliasModel, mIconModel, userPreferences);
|
||||
mRadioReference = new RadioReference(mUserPreferences);
|
||||
mAliasListSynchronizer = new AliasListSynchronizer(mAliasModel, mRadioReference, mUserPreferences);
|
||||
|
||||
mChannelModel = new ChannelModel(mAliasModel);
|
||||
mChannelProcessingManager = new ChannelProcessingManager(mChannelMapModel, eventLogManager, mTunerManager,
|
||||
@@ -120,6 +124,8 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
mChannelModel.addListener(this);
|
||||
|
||||
mAliasModel.aliasList().addListener((ListChangeListener<Alias>)c -> schedulePlaylistSave());
|
||||
mAliasModel.aliasListConfigurations()
|
||||
.addListener((ListChangeListener<AliasListConfiguration>)c -> schedulePlaylistSave());
|
||||
|
||||
mChannelMapModel.getChannelMaps().addListener((ListChangeListener<ChannelMap>)c -> schedulePlaylistSave());
|
||||
|
||||
@@ -248,6 +254,14 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
return mBroadcastModel;
|
||||
}
|
||||
|
||||
/**
|
||||
* Synchronizer for alias lists that track a Radio Reference system.
|
||||
*/
|
||||
public AliasListSynchronizer getAliasListSynchronizer()
|
||||
{
|
||||
return mAliasListSynchronizer;
|
||||
}
|
||||
|
||||
/**
|
||||
* Channel Map model managed by this playlist manager
|
||||
*/
|
||||
@@ -264,6 +278,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
{
|
||||
PlaylistV2 playlist = load();
|
||||
transferPlaylistToModels(playlist);
|
||||
mAliasListSynchronizer.start();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -401,6 +416,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
mPlaylistLoading = true;
|
||||
|
||||
mAliasModel.addAliases(playlist.getAliases());
|
||||
mAliasModel.addAliasListConfigurations(playlist.getAliasListConfigurations());
|
||||
|
||||
|
||||
mBroadcastModel.addBroadcastConfigurations(playlist.getBroadcastConfigurations());
|
||||
@@ -445,6 +461,7 @@ public class PlaylistManager implements Listener<ChannelEvent>
|
||||
PlaylistV2 playlist = new PlaylistV2();
|
||||
|
||||
playlist.setAliases(new ArrayList(mAliasModel.getAliases()));
|
||||
playlist.setAliasListConfigurations(new ArrayList<>(mAliasModel.aliasListConfigurations()));
|
||||
playlist.setBroadcastConfigurations(new ArrayList(mBroadcastModel.getBroadcastConfigurations()));
|
||||
playlist.setChannels(new ArrayList(mChannelModel.getChannels()));
|
||||
playlist.setChannelMaps(new ArrayList(mChannelMapModel.getChannelMaps()));
|
||||
|
||||
@@ -24,6 +24,7 @@ package io.github.dsheirer.playlist;
|
||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
||||
import io.github.dsheirer.alias.Alias;
|
||||
import io.github.dsheirer.alias.AliasListConfiguration;
|
||||
import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
|
||||
import io.github.dsheirer.controller.channel.Channel;
|
||||
import io.github.dsheirer.controller.channel.map.ChannelMap;
|
||||
@@ -36,6 +37,7 @@ public class PlaylistV2
|
||||
{
|
||||
private int mVersion = PlaylistManager.PLAYLIST_CURRENT_VERSION;
|
||||
private List<Alias> mAliases = new ArrayList<>();
|
||||
private List<AliasListConfiguration> mAliasListConfigurations = new ArrayList<>();
|
||||
private List<BroadcastConfiguration> mBroadcastConfigurations = new ArrayList<>();
|
||||
private List<Channel> mChannels = new ArrayList<>();
|
||||
private List<ChannelMap> mChannelMaps = new ArrayList<>();
|
||||
@@ -72,6 +74,20 @@ public class PlaylistV2
|
||||
mAliases = aliases;
|
||||
}
|
||||
|
||||
/**
|
||||
* Alias list settings, like Radio Reference system tracking. Older playlists don't have these.
|
||||
*/
|
||||
@JacksonXmlProperty(isAttribute = false, localName = "alias_list")
|
||||
public List<AliasListConfiguration> getAliasListConfigurations()
|
||||
{
|
||||
return mAliasListConfigurations;
|
||||
}
|
||||
|
||||
public void setAliasListConfigurations(List<AliasListConfiguration> configurations)
|
||||
{
|
||||
mAliasListConfigurations = configurations != null ? configurations : new ArrayList<>();
|
||||
}
|
||||
|
||||
@JacksonXmlProperty(isAttribute = false, localName = "channel")
|
||||
public List<Channel> getChannels()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user