#90 [WIP] merged metadata management for channel state, decoder states and audio metadata into a new metadata class. The new metadata class is maintained for each decoding audio channel, or in the future, a decoding TDMA channel. Audio playback, recording and streaming all use the same metadata object for the channel. The list of channel processing gui panels have been deleted and channel processing status will now reside in a table where each table row is a metadata instance from the processing channel. The channel processing manager is responsible for adding/removing the channel's metadata instance to/from the metadata table. This allows the channel processing table to be the controller for the messages, events and channel spectrum views, keyed to the selected table row metadata.

I still have to clean up the gui components and wire in the table selection listeners.
This commit is contained in:
Denny
2017-01-17 19:24:54 -05:00
parent 16b69d4aef
commit bc8873de01
67 changed files with 6207 additions and 10127 deletions

View File

@@ -8,6 +8,7 @@
<w>icecast</w> <w>icecast</w>
<w>ident</w> <w>ident</w>
<w>polyphase</w> <w>polyphase</w>
<w>remez</w>
<w>samplerate</w> <w>samplerate</w>
<w>sdrtrunk</w> <w>sdrtrunk</w>
<w>sheirer</w> <w>sheirer</w>

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,6 +14,7 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package alias; package alias;
@@ -29,7 +30,6 @@ import alias.id.siteID.SiteID;
import alias.id.status.StatusID; import alias.id.status.StatusID;
import alias.id.talkgroup.TalkgroupID; import alias.id.talkgroup.TalkgroupID;
import alias.id.uniqueID.UniqueID; import alias.id.uniqueID.UniqueID;
import audio.metadata.MetadataType;
import module.decode.lj1200.LJ1200Message.Function; import module.decode.lj1200.LJ1200Message.Function;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -619,61 +619,6 @@ public class AliasList implements Listener<AliasEvent>
return mName; return mName;
} }
/**
* Lookup an alias by metadata type and string value
*/
public Alias getAlias(String value, MetadataType type)
{
switch (type)
{
case ESN:
return getESNAlias(value);
case FLEETSYNC:
return getFleetsyncAlias(value);
case MDC1200:
return getMDC1200Alias(value);
case MOBILE_ID:
return getMobileIDNumberAlias(value);
case MPT1327:
return getMPT1327Alias(value);
case SITE_ID:
return getSiteID(value);
case STATUS:
if (value != null)
{
try
{
return getStatus(Integer.valueOf(value));
}
catch (Exception e)
{
//do nothing, we couldn't parse the int value
}
}
break;
case FROM:
case TO:
return getTalkgroupAlias(value);
case UNIQUE_ID:
if (value != null)
{
try
{
return getUniqueID(Integer.valueOf(value));
}
catch (Exception e)
{
//do nothing, we couldn't parse the int value
}
}
break;
default:
break;
}
return null;
}
/** /**
* Receive alias change event notifications and modify this list accordingly * Receive alias change event notifications and modify this list accordingly
*/ */

View File

@@ -19,10 +19,8 @@
package audio; package audio;
import alias.Alias; import alias.Alias;
import audio.metadata.AudioMetadata;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import audio.output.AudioOutput; import audio.output.AudioOutput;
import channel.metadata.Metadata;
import icon.IconManager; import icon.IconManager;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import sample.Listener; import sample.Listener;
@@ -50,12 +48,12 @@ public class AudioChannelPanel extends JPanel
private JLabel mChannelName = new JLabel(" "); private JLabel mChannelName = new JLabel(" ");
private JLabel mToLabel = new JLabel("TO:"); private JLabel mToLabel = new JLabel("TO:");
private JLabel mTo = new JLabel(""); private JLabel mTo = new JLabel("-----");
private JLabel mToAlias = new JLabel(""); private JLabel mToAlias = new JLabel("");
private JLabel mMutedLabel = new JLabel(" "); private JLabel mMutedLabel = new JLabel(" ");
private JLabel mFromLabel = new JLabel("FROM:"); private JLabel mFromLabel = new JLabel("FROM:");
private JLabel mFrom = new JLabel(""); private JLabel mFrom = new JLabel("-----");
private JLabel mFromAlias = new JLabel(""); private JLabel mFromAlias = new JLabel("");
private boolean mConfigured = false; private boolean mConfigured = false;
@@ -71,7 +69,7 @@ public class AudioChannelPanel extends JPanel
if(mAudioOutput != null) if(mAudioOutput != null)
{ {
mAudioOutput.addAudioEventListener(this); mAudioOutput.addAudioEventListener(this);
mAudioOutput.setAudioMetadataListener(new AudioMetadataProcessor()); mAudioOutput.setMetadataListener(new AudioMetadataProcessor());
} }
mLabelColor = mSettingsManager.getColorSetting( mLabelColor = mSettingsManager.getColorSetting(
@@ -173,11 +171,8 @@ public class AudioChannelPanel extends JPanel
*/ */
private void resetLabels() private void resetLabels()
{ {
mFrom.setText(""); updateLabel(mFromLabel, null, mFromAlias, null);
updateAlias(mFromAlias, null); updateLabel(mToLabel, null, mToAlias, null);
mTo.setText("");
updateAlias(mToAlias, null);
mConfigured = false; mConfigured = false;
} }
@@ -187,27 +182,25 @@ public class AudioChannelPanel extends JPanel
* does not occur on the Swing event thread -- wrap any calls to this * does not occur on the Swing event thread -- wrap any calls to this
* method with an event thread call. * method with an event thread call.
*/ */
private void updateAlias(JLabel label, Alias alias) private void updateLabel(JLabel valueLabel, String value, JLabel aliasLabel, Alias alias)
{ {
if(value != null)
{
valueLabel.setText(value);
if(alias != null) if(alias != null)
{ {
label.setText(alias.getName()); aliasLabel.setIcon(mIconManager.getIcon(alias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
String icon = alias.getIconName();
if(icon != null)
{
label.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
} }
else else
{ {
label.setIcon(null); aliasLabel.setIcon(null);
} }
} }
else else
{ {
label.setText(""); valueLabel.setText("-----");
label.setIcon(null); aliasLabel.setIcon(null);
} }
} }
@@ -215,45 +208,28 @@ public class AudioChannelPanel extends JPanel
/** /**
* Processes audio metadata to update this panel's display values * Processes audio metadata to update this panel's display values
*/ */
public class AudioMetadataProcessor implements Listener<AudioMetadata> public class AudioMetadataProcessor implements Listener<Metadata>
{ {
@Override @Override
public void receive(AudioMetadata audioMetadata) public void receive(final Metadata metadata)
{ {
if(!mConfigured || audioMetadata.isUpdated()) if(metadata.isUpdated() || !mConfigured)
{ {
final Metadata from = audioMetadata.getMetadata(MetadataType.FROM);
final Metadata to = audioMetadata.getMetadata(MetadataType.TO);
EventQueue.invokeLater(new Runnable() EventQueue.invokeLater(new Runnable()
{ {
@Override @Override
public void run() public void run()
{ {
if(from != null) updateLabel(mFromLabel, metadata.getPrimaryAddressFrom().getIdentifier(),
{ mFromAlias, metadata.getPrimaryAddressFrom().getAlias());
mFrom.setText(from.getValue());
updateAlias(mFromAlias, from.getAlias());
}
else
{
mFrom.setText("-----");
}
if(to != null) updateLabel(mToLabel, metadata.getPrimaryAddressTo().getIdentifier(),
{ mToAlias, metadata.getPrimaryAddressTo().getAlias());
mTo.setText(to.getValue());
updateAlias(mToAlias, to.getAlias()); mConfigured = true;
}
else
{
mTo.setText("-----");
}
} }
}); });
mConfigured = true;
} }
} }
} }

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,27 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package audio; package audio;
import audio.AudioEvent.Type;
import audio.output.AudioOutput;
import audio.output.MonoAudioOutput;
import audio.output.StereoAudioOutput;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Broadcaster;
import sample.Listener;
import source.mixer.MixerChannel;
import source.mixer.MixerChannelConfiguration;
import source.mixer.MixerManager;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Mixer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
@@ -27,25 +45,6 @@ import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.Mixer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Broadcaster;
import sample.Listener;
import source.mixer.MixerChannel;
import source.mixer.MixerChannelConfiguration;
import source.mixer.MixerManager;
import audio.AudioEvent.Type;
import audio.output.AudioOutput;
import audio.output.MonoAudioOutput;
import audio.output.StereoAudioOutput;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;
public class AudioManager implements Listener<AudioPacket>, IAudioController public class AudioManager implements Listener<AudioPacket>, IAudioController
{ {
private static final Logger mLog = LoggerFactory.getLogger(AudioManager.class); private static final Logger mLog = LoggerFactory.getLogger(AudioManager.class);
@@ -184,9 +183,9 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
for(AudioOutputConnection connection : mAudioOutputConnections) for(AudioOutputConnection connection : mAudioOutputConnections)
{ {
if(connection.isInactive() && if(connection.isInactive() &&
mChannelConnectionMap.containsKey( connection.getSource() ) ) mChannelConnectionMap.containsKey(connection.getChannelMetadataID()))
{ {
mChannelConnectionMap.remove( connection.getSource() ); mChannelConnectionMap.remove(connection.getChannelMetadataID());
connection.disconnect(); connection.disconnect();
changed = true; changed = true;
} }
@@ -208,8 +207,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
for(AudioOutputConnection connection : mAudioOutputConnections) for(AudioOutputConnection connection : mAudioOutputConnections)
{ {
if(connection.isConnected() && if(connection.isConnected() &&
( mLowestPriorityConnection == null || (mLowestPriorityConnection == null || mLowestPriorityConnection.getPriority() > connection.getPriority()))
mLowestPriorityConnection.getPriority() > connection.getPriority() ) )
{ {
mLowestPriorityConnection = connection; mLowestPriorityConnection = connection;
} }
@@ -220,8 +218,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
public void setMixerChannelConfiguration(MixerChannelConfiguration entry) throws AudioException public void setMixerChannelConfiguration(MixerChannelConfiguration entry) throws AudioException
{ {
if(entry != null && if(entry != null &&
( entry.getMixerChannel() == MixerChannel.MONO || (entry.getMixerChannel() == MixerChannel.MONO || entry.getMixerChannel() == MixerChannel.STEREO))
entry.getMixerChannel() == MixerChannel.STEREO ) )
{ {
mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_STARTED); mControllerBroadcaster.broadcast(CONFIGURATION_CHANGE_STARTED);
@@ -242,14 +239,12 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
mAudioOutputMap.put(mono.getChannelName(), mono); mAudioOutputMap.put(mono.getChannelName(), mono);
break; break;
case STEREO: case STEREO:
AudioOutput left = new StereoAudioOutput( mThreadPoolManager, AudioOutput left = new StereoAudioOutput(mThreadPoolManager, entry.getMixer(), MixerChannel.LEFT);
entry.getMixer(), MixerChannel.LEFT );
mAudioOutputConnections.add(new AudioOutputConnection(left)); mAudioOutputConnections.add(new AudioOutputConnection(left));
mAvailableConnectionCount++; mAvailableConnectionCount++;
mAudioOutputMap.put(left.getChannelName(), left); mAudioOutputMap.put(left.getChannelName(), left);
AudioOutput right = new StereoAudioOutput( mThreadPoolManager, AudioOutput right = new StereoAudioOutput(mThreadPoolManager, entry.getMixer(), MixerChannel.RIGHT);
entry.getMixer(), MixerChannel.RIGHT );
mAudioOutputConnections.add(new AudioOutputConnection(right)); mAudioOutputConnections.add(new AudioOutputConnection(right));
mAvailableConnectionCount++; mAvailableConnectionCount++;
mAudioOutputMap.put(right.getChannelName(), right); mAudioOutputMap.put(right.getChannelName(), right);
@@ -341,12 +336,12 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
*/ */
private AudioOutputConnection getConnection(AudioPacket packet) private AudioOutputConnection getConnection(AudioPacket packet)
{ {
int source = packet.getAudioMetadata().getSource(); int channelMetadataID = packet.getMetadata().getMetadataID();
//Use an existing connection //Use an existing connection
if( mChannelConnectionMap.containsKey( source ) ) if(mChannelConnectionMap.containsKey(channelMetadataID))
{ {
return mChannelConnectionMap.get( source ); return mChannelConnectionMap.get(channelMetadataID);
} }
//Connect to and use an available connection //Connect to and use an available connection
@@ -356,8 +351,8 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
{ {
if(connection.isDisconnected()) if(connection.isDisconnected())
{ {
connection.connect( source ); connection.connect(channelMetadataID);
mChannelConnectionMap.put( source, connection ); mChannelConnectionMap.put(channelMetadataID, connection);
return connection; return connection;
} }
} }
@@ -365,18 +360,18 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
//Preempt an existing connection and connect it to this higher priority source //Preempt an existing connection and connect it to this higher priority source
else //Check for a channel priority override else //Check for a channel priority override
{ {
int priority = packet.getAudioMetadata().getPriority(); int priority = packet.getMetadata().getAudioPriority();
if(mLowestPriorityConnection != null && if(mLowestPriorityConnection != null &&
priority < mLowestPriorityConnection.getPriority()) priority < mLowestPriorityConnection.getPriority())
{ {
AudioOutputConnection connection = mLowestPriorityConnection; AudioOutputConnection connection = mLowestPriorityConnection;
mChannelConnectionMap.remove( connection.getSource() ); mChannelConnectionMap.remove(connection.getChannelMetadataID());
connection.connect( source ); connection.connect(channelMetadataID);
mChannelConnectionMap.put( source, connection ); mChannelConnectionMap.put(channelMetadataID, connection);
updateLowestPriorityAssignment(); updateLowestPriorityAssignment();
@@ -405,8 +400,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
for(AudioPacket packet : packets) for(AudioPacket packet : packets)
{ {
/* Don't process any packet's marked as do not monitor */ /* Don't process any packet's marked as do not monitor */
if( !packet.getAudioMetadata().isDoNotMonitor() && if(!packet.getMetadata().isDoNotMonitor() && packet.getType() == AudioPacket.Type.AUDIO)
packet.getType() == AudioPacket.Type.AUDIO )
{ {
AudioOutputConnection connection = getConnection(packet); AudioOutputConnection connection = getConnection(packet);
@@ -436,7 +430,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
private AudioOutput mAudioOutput; private AudioOutput mAudioOutput;
private int mPriority = 0; private int mPriority = 0;
private int mSource = DISCONNECTED; private int mChannelMetadataID = DISCONNECTED;
public AudioOutputConnection(AudioOutput audioOutput) public AudioOutputConnection(AudioOutput audioOutput)
{ {
@@ -445,10 +439,9 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
public void receive(AudioPacket packet) public void receive(AudioPacket packet)
{ {
if( packet.hasAudioMetadata() && if(packet.hasMetadata() && packet.getMetadata().getMetadataID() == mChannelMetadataID)
packet.getAudioMetadata().getSource() == mSource )
{ {
int priority = packet.getAudioMetadata().getPriority(); int priority = packet.getMetadata().getAudioPriority();
if(mPriority != priority) if(mPriority != priority)
{ {
@@ -463,17 +456,14 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
} }
else else
{ {
if( packet.hasAudioMetadata() ) if(packet.hasMetadata())
{ {
mLog.error( "Received audio packet from channel source [" + mLog.error("Received audio packet from channel metadata [" + packet.getMetadata().getMetadataID() +
packet.getAudioMetadata().getSource() + "] however this assignment is currently connected to metadata [" + mChannelMetadataID + "]");
"] however this assignment is currently connected "
+ "to channel source [" + mSource + "]" );
} }
else else
{ {
mLog.error( "Received audio packet with no metadata - " mLog.error("Received audio packet with no metadata - cannot route audio packet");
+ "cannot route audio packet" );
} }
} }
} }
@@ -492,7 +482,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
*/ */
public boolean isDisconnected() public boolean isDisconnected()
{ {
return mSource == DISCONNECTED; return mChannelMetadataID == DISCONNECTED;
} }
/** /**
@@ -509,7 +499,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
*/ */
public void connect(int source) public void connect(int source)
{ {
mSource = source; mChannelMetadataID = source;
mAudioOutput.updateTimestamp(); mAudioOutput.updateTimestamp();
} }
@@ -517,9 +507,9 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
/** /**
* Currently connected source or -1 if disconnected * Currently connected source or -1 if disconnected
*/ */
public int getSource() public int getChannelMetadataID()
{ {
return mSource; return mChannelMetadataID;
} }
/** /**
@@ -528,7 +518,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
*/ */
public void disconnect() public void disconnect()
{ {
mSource = DISCONNECTED; mChannelMetadataID = DISCONNECTED;
mPriority = 0; mPriority = 0;
} }

View File

@@ -1,29 +1,38 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package audio; package audio;
import java.util.Arrays; import audio.squelch.ISquelchStateListener;
import java.util.concurrent.ScheduledExecutorService; import audio.squelch.SquelchState;
import channel.metadata.Metadata;
import dsp.filter.design.FilterDesignException; import dsp.filter.design.FilterDesignException;
import dsp.filter.fir.FIRFilterSpecification; import dsp.filter.fir.FIRFilterSpecification;
import dsp.filter.fir.remez.RemezFIRFilterDesigner; import dsp.filter.fir.remez.RemezFIRFilterDesigner;
import dsp.filter.polyphase.PolyphaseFIRDecimatingFilter_RB; import dsp.filter.polyphase.PolyphaseFIRDecimatingFilter_RB;
import module.Module; import module.Module;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sample.Listener; import sample.Listener;
import sample.real.IFilteredRealBufferListener; import sample.real.IFilteredRealBufferListener;
import sample.real.RealBuffer; import sample.real.RealBuffer;
import audio.metadata.AudioMetadata;
import audio.metadata.IMetadataListener; import java.util.concurrent.ScheduledExecutorService;
import audio.metadata.Metadata;
import audio.squelch.ISquelchStateListener;
import audio.squelch.SquelchState;
import controller.channel.ChannelEvent;
import controller.channel.IChannelEventListener;
import dsp.filter.Filters;
import dsp.filter.fir.real.RealFIRFilter_R_R;
/** /**
* Provides packaging of demodulated audio sample buffers into audio packets for * Provides packaging of demodulated audio sample buffers into audio packets for
@@ -33,12 +42,8 @@ import dsp.filter.fir.real.RealFIRFilter_R_R;
* Incorporates audio squelch state listener to control if audio packets are * Incorporates audio squelch state listener to control if audio packets are
* broadcast or ignored. * broadcast or ignored.
*/ */
public class AudioModule extends Module implements IAudioPacketProvider, public class AudioModule extends Module implements IAudioPacketProvider, IFilteredRealBufferListener,
IChannelEventListener, ISquelchStateListener, Listener<RealBuffer>
IMetadataListener,
IFilteredRealBufferListener,
ISquelchStateListener,
Listener<RealBuffer>
{ {
protected static final Logger mLog = LoggerFactory.getLogger(AudioModule.class); protected static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
@@ -74,22 +79,15 @@ public class AudioModule extends Module implements IAudioPacketProvider,
} }
} }
/* Provides a unique identifier for this audio module instance to use as a
* source identifier for all audio packets */
private static int UNIQUE_ID = 0;
private int mSourceID;
private AudioMetadata mAudioMetadata;
private ChannelEventListener mChannelEventListener = new ChannelEventListener();
private SquelchStateListener mSquelchStateListener = new SquelchStateListener(); private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
private SquelchState mSquelchState = SquelchState.SQUELCH; private SquelchState mSquelchState = SquelchState.SQUELCH;
private Listener<AudioPacket> mAudioPacketListener; private Listener<AudioPacket> mAudioPacketListener;
private PolyphaseFIRDecimatingFilter_RB mAudioDecimationFilter; private PolyphaseFIRDecimatingFilter_RB mAudioDecimationFilter;
private Metadata mMetadata;
public AudioModule(boolean record) public AudioModule(Metadata metadata)
{ {
mSourceID = ++UNIQUE_ID; mMetadata = metadata;
mAudioMetadata = new AudioMetadata(mSourceID, record);
mAudioDecimationFilter = new PolyphaseFIRDecimatingFilter_RB(mDecimationCoefficients, 6, 2.0f); mAudioDecimationFilter = new PolyphaseFIRDecimatingFilter_RB(mDecimationCoefficients, 6, 2.0f);
mAudioDecimationFilter.setListener(new Listener<RealBuffer>() mAudioDecimationFilter.setListener(new Listener<RealBuffer>()
@@ -99,7 +97,7 @@ public class AudioModule extends Module implements IAudioPacketProvider,
{ {
if(mAudioPacketListener != null) if(mAudioPacketListener != null)
{ {
AudioPacket packet = new AudioPacket(realBuffer.getSamples(), mAudioMetadata.copyOf()); AudioPacket packet = new AudioPacket(realBuffer.getSamples(), mMetadata.copyOf());
mAudioPacketListener.receive(packet); mAudioPacketListener.receive(packet);
} }
} }
@@ -116,7 +114,6 @@ public class AudioModule extends Module implements IAudioPacketProvider,
@Override @Override
public void reset() public void reset()
{ {
mAudioMetadata.reset();
} }
@Override @Override
@@ -131,8 +128,7 @@ public class AudioModule extends Module implements IAudioPacketProvider,
/* Issue an end audio packet in case a recorder is still rolling */ /* Issue an end audio packet in case a recorder is still rolling */
if(mAudioPacketListener != null) if(mAudioPacketListener != null)
{ {
mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
mAudioMetadata.copyOf()));
} }
} }
@@ -146,12 +142,6 @@ public class AudioModule extends Module implements IAudioPacketProvider,
if(mAudioPacketListener != null && mSquelchState == SquelchState.UNSQUELCH) if(mAudioPacketListener != null && mSquelchState == SquelchState.UNSQUELCH)
{ {
mAudioDecimationFilter.receive(buffer); mAudioDecimationFilter.receive(buffer);
// /* We make a copy of the samples, so that we don't affect any other
// * processes that might be concurrently processing the same buffer */
// float[] audio = Arrays.copyOf( buffer.getSamples(), buffer.getSamples().length );
//
// mAudioFilter.filter( audio );
} }
} }
@@ -161,12 +151,6 @@ public class AudioModule extends Module implements IAudioPacketProvider,
return this; return this;
} }
@Override
public Listener<Metadata> getMetadataListener()
{
return mAudioMetadata;
}
@Override @Override
public void setAudioPacketListener(Listener<AudioPacket> listener) public void setAudioPacketListener(Listener<AudioPacket> listener)
{ {
@@ -179,41 +163,12 @@ public class AudioModule extends Module implements IAudioPacketProvider,
mAudioPacketListener = null; mAudioPacketListener = null;
} }
@Override
public Listener<ChannelEvent> getChannelEventListener()
{
return mChannelEventListener;
}
@Override @Override
public Listener<SquelchState> getSquelchStateListener() public Listener<SquelchState> getSquelchStateListener()
{ {
return mSquelchStateListener; return mSquelchStateListener;
} }
/**
* Wrapper for channel event listener. Responds to channel state reset
* events to remove/cleanup current audio metadata
*/
public class ChannelEventListener implements Listener<ChannelEvent>
{
@Override
public void receive(ChannelEvent event)
{
switch (event.getEvent())
{
case NOTIFICATION_STATE_RESET:
mAudioMetadata.reset();
break;
case NOTIFICATION_SELECTION_CHANGE:
mAudioMetadata.setSelected(event.getChannel().isSelected());
break;
default:
break;
}
}
}
/** /**
* Wrapper for squelch state listener * Wrapper for squelch state listener
*/ */
@@ -224,8 +179,7 @@ public class AudioModule extends Module implements IAudioPacketProvider,
{ {
if(state == SquelchState.SQUELCH && mAudioPacketListener != null) if(state == SquelchState.SQUELCH && mAudioPacketListener != null)
{ {
mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
mAudioMetadata.copyOf()));
} }
mSquelchState = state; mSquelchState = state;

View File

@@ -1,11 +1,6 @@
package audio;
import sample.real.RealBuffer;
import audio.metadata.AudioMetadata;
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014,2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -19,39 +14,45 @@ import audio.metadata.AudioMetadata;
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package audio;
import channel.metadata.Metadata;
import sample.real.RealBuffer;
public class AudioPacket public class AudioPacket
{ {
private Type mType; private Type mType;
private RealBuffer mAudioData; private RealBuffer mAudioData;
private AudioMetadata mAudioMetadata; private Metadata mMetadata;
public AudioPacket( Type type, AudioMetadata metadata ) public AudioPacket(Type type, Metadata metadata)
{ {
mType = type; mType = type;
mAudioMetadata = metadata; mMetadata = metadata;
} }
public AudioPacket( float[] audio, AudioMetadata metadata ) public AudioPacket(float[] audio, Metadata metadata)
{ {
this(Type.AUDIO, metadata); this(Type.AUDIO, metadata);
mAudioData = new RealBuffer(audio); mAudioData = new RealBuffer(audio);
} }
public boolean hasAudioMetadata() public boolean hasMetadata()
{ {
return mAudioMetadata != null; return mMetadata != null;
} }
public AudioMetadata getAudioMetadata() public Metadata getMetadata()
{ {
return mAudioMetadata; return mMetadata;
} }
public void setMetadata( AudioMetadata metadata ) public void setMetadata(Metadata metadata)
{ {
mAudioMetadata = metadata; mMetadata = metadata;
} }
public Type getType() public Type getType()

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdrtrunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,14 +18,11 @@
******************************************************************************/ ******************************************************************************/
package audio.broadcast; package audio.broadcast;
import audio.AudioPacket;
import audio.IAudioPacketListener;
import audio.convert.ISilenceGenerator; import audio.convert.ISilenceGenerator;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import properties.SystemProperties;
import sample.Listener; import sample.Listener;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
@@ -34,7 +31,6 @@ import java.nio.file.Files;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@@ -107,9 +103,10 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
/** /**
* Broadcasts the next song's audio metadata prior to streaming the next song. * Broadcasts the next song's audio metadata prior to streaming the next song.
*
* @param metadata for the next recording that will be streamed * @param metadata for the next recording that will be streamed
*/ */
protected void broadcastMetadata(AudioMetadata metadata) protected void broadcastMetadata(Metadata metadata)
{ {
IBroadcastMetadataUpdater metadataUpdater = getMetadataUpdater(); IBroadcastMetadataUpdater metadataUpdater = getMetadataUpdater();
@@ -160,6 +157,7 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
/** /**
* Stream name for the broadcast configuration for this broadcaster * Stream name for the broadcast configuration for this broadcaster
*
* @return stream name or null * @return stream name or null
*/ */
public String getStreamName() public String getStreamName()
@@ -431,7 +429,7 @@ public abstract class AudioBroadcaster implements Listener<AudioRecording>
if(connected()) if(connected())
{ {
broadcastMetadata(nextRecording.getAudioMetadata()); broadcastMetadata(nextRecording.getMetadata());
} }
metadataUpdateRequired = false; metadataUpdateRequired = false;

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdrtrunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
******************************************************************************/ ******************************************************************************/
package audio.broadcast; package audio.broadcast;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -30,22 +30,23 @@ public class AudioRecording implements Comparable<AudioRecording>
private final static Logger mLog = LoggerFactory.getLogger(StreamManager.class); private final static Logger mLog = LoggerFactory.getLogger(StreamManager.class);
private Path mPath; private Path mPath;
private AudioMetadata mAudioMetadata;
private long mStartTime; private long mStartTime;
private long mRecordingLength; private long mRecordingLength;
private AtomicInteger mPendingReplayCount = new AtomicInteger(); private AtomicInteger mPendingReplayCount = new AtomicInteger();
private Metadata mMetadata;
/** /**
* Audio recording that is ready to be streamed * Audio recording that is ready to be streamed
*
* @param path to the audio recording file * @param path to the audio recording file
* @param audioMetadata associated with the recording * @param metadata associated with the recording
* @param start time of recording in milliseconds since epoch * @param start time of recording in milliseconds since epoch
* @param recordingLength in milliseconds * @param recordingLength in milliseconds
*/ */
public AudioRecording(Path path, AudioMetadata audioMetadata, long start, long recordingLength) public AudioRecording(Path path, Metadata metadata, long start, long recordingLength)
{ {
mPath = path; mPath = path;
mAudioMetadata = audioMetadata; mMetadata = metadata;
mStartTime = start; mStartTime = start;
mRecordingLength = recordingLength; mRecordingLength = recordingLength;
} }
@@ -61,9 +62,9 @@ public class AudioRecording implements Comparable<AudioRecording>
/** /**
* Optional audio metadata for the recording. * Optional audio metadata for the recording.
*/ */
public AudioMetadata getAudioMetadata() public Metadata getMetadata()
{ {
return mAudioMetadata; return mMetadata;
} }
/** /**

View File

@@ -20,7 +20,7 @@ package audio.broadcast;
import alias.id.broadcast.BroadcastChannel; import alias.id.broadcast.BroadcastChannel;
import audio.AudioPacket; import audio.AudioPacket;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import icon.IconManager; import icon.IconManager;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -164,6 +164,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
/** /**
* Updates the configuration's name so that it is unique among all other broadcast configurations * Updates the configuration's name so that it is unique among all other broadcast configurations
*
* @param configuration * @param configuration
*/ */
private void ensureUniqueName(BroadcastConfiguration configuration) private void ensureUniqueName(BroadcastConfiguration configuration)
@@ -275,8 +276,8 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
@Override @Override
public void receive(AudioPacket audioPacket) public void receive(AudioPacket audioPacket)
{ {
if (audioPacket.hasAudioMetadata() && if(audioPacket.hasMetadata() &&
audioPacket.getAudioMetadata().isStreamable()) audioPacket.getMetadata().isStreamable())
{ {
mStreamManager.receive(audioPacket); mStreamManager.receive(audioPacket);
} }
@@ -686,7 +687,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
@Override @Override
public void receive(AudioRecording audioRecording) public void receive(AudioRecording audioRecording)
{ {
AudioMetadata metadata = audioRecording.getAudioMetadata(); Metadata metadata = audioRecording.getMetadata();
if(metadata != null && metadata.isStreamable()) if(metadata != null && metadata.isStreamable())
{ {

View File

@@ -18,7 +18,7 @@
******************************************************************************/ ******************************************************************************/
package audio.broadcast; package audio.broadcast;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
public interface IBroadcastMetadataUpdater public interface IBroadcastMetadataUpdater
{ {
@@ -27,5 +27,5 @@ public interface IBroadcastMetadataUpdater
* *
* @param metadata containing metadata attributes * @param metadata containing metadata attributes
*/ */
void update(AudioMetadata metadata); void update(Metadata metadata);
} }

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdrtrunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -122,19 +122,19 @@ public class StreamManager implements Listener<AudioPacket>
@Override @Override
public void receive(AudioPacket audioPacket) public void receive(AudioPacket audioPacket)
{ {
if(mRunning.get() && audioPacket.hasAudioMetadata()) if(mRunning.get() && audioPacket.hasMetadata())
{ {
synchronized(mStreamRecorders) synchronized(mStreamRecorders)
{ {
int sourceChannelID = audioPacket.getAudioMetadata().getSource(); int channelMetadataID = audioPacket.getMetadata().getMetadataID();
AudioPacket.Type type = audioPacket.getType(); AudioPacket.Type type = audioPacket.getType();
if(type == AudioPacket.Type.AUDIO) if(type == AudioPacket.Type.AUDIO)
{ {
if(mStreamRecorders.containsKey(sourceChannelID)) if(mStreamRecorders.containsKey(channelMetadataID))
{ {
AudioRecorder recorder = mStreamRecorders.get(sourceChannelID); AudioRecorder recorder = mStreamRecorders.get(channelMetadataID);
if(recorder != null) if(recorder != null)
{ {
@@ -147,12 +147,12 @@ public class StreamManager implements Listener<AudioPacket>
mBroadcastFormat); mBroadcastFormat);
recorder.start(mThreadPoolManager.getScheduledExecutorService()); recorder.start(mThreadPoolManager.getScheduledExecutorService());
recorder.receive(audioPacket); recorder.receive(audioPacket);
mStreamRecorders.put(sourceChannelID, recorder); mStreamRecorders.put(channelMetadataID, recorder);
} }
} }
else if(type == AudioPacket.Type.END) else if(type == AudioPacket.Type.END)
{ {
removeRecorder(sourceChannelID); removeRecorder(channelMetadataID);
} }
else else
{ {

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdrtrunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
package audio.broadcast.icecast; package audio.broadcast.icecast;
import audio.broadcast.IBroadcastMetadataUpdater; import audio.broadcast.IBroadcastMetadataUpdater;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import org.apache.mina.core.future.ConnectFuture; import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.service.IoHandlerAdapter;
@@ -116,9 +114,9 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
* and will remain in the update queue until the next metadata update is requested. However, this is a design * and will remain in the update queue until the next metadata update is requested. However, this is a design
* trade-off to avoid having a scheduled runnable repeatedly processing the update queue. * trade-off to avoid having a scheduled runnable repeatedly processing the update queue.
*/ */
public void update(AudioMetadata audioMetadata) public void update(Metadata metadata)
{ {
mMetadataQueue.offer(getSong(audioMetadata)); mMetadataQueue.offer(getSong(metadata));
if(mUpdating.compareAndSet(false, true)) if(mUpdating.compareAndSet(false, true))
{ {
@@ -182,52 +180,45 @@ public class IcecastBroadcastMetadataUpdater implements IBroadcastMetadataUpdate
/** /**
* Creates the song information for a metadata update * Creates the song information for a metadata update
*/ */
private static String getSong(AudioMetadata audioMetadata) private static String getSong(Metadata metadata)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if(audioMetadata != null) if(metadata != null)
{ {
Metadata to = audioMetadata.getMetadata(MetadataType.TO); String to = metadata.getPrimaryAddressTo().getIdentifier();
sb.append("TO:"); sb.append("TO:");
if(to != null) if(metadata.getPrimaryAddressTo().hasAlias())
{ {
if(to.hasAlias()) sb.append(metadata.getPrimaryAddressTo().getAlias().getName());
{
sb.append(to.getAlias().getName());
} }
else else if(metadata.getPrimaryAddressTo().hasIdentifier())
{ {
sb.append(to.getValue()); sb.append(metadata.getPrimaryAddressTo().getIdentifier());
}
} }
else else
{ {
sb.append("UNKNOWN"); sb.append("UNKNOWN");
} }
Metadata from = audioMetadata.getMetadata(MetadataType.FROM);
sb.append(" FROM:"); sb.append(" FROM:");
if(from != null) if(metadata.getPrimaryAddressFrom().hasAlias())
{ {
sb.append(metadata.getPrimaryAddressFrom().getAlias().getName());
if(from.hasAlias())
{
sb.append(from.getAlias().getName());
} }
else else if(metadata.getPrimaryAddressFrom().hasIdentifier())
{ {
sb.append(from.getValue()); sb.append(metadata.getPrimaryAddressFrom().getIdentifier());
}
} }
else else
{ {
sb.append("UNKNOWN"); sb.append("UNKNOWN");
} }
} }
else else
{ {

View File

@@ -19,9 +19,7 @@
package audio.broadcast.shoutcast.v1; package audio.broadcast.shoutcast.v1;
import audio.broadcast.IBroadcastMetadataUpdater; import audio.broadcast.IBroadcastMetadataUpdater;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import org.apache.mina.core.future.ConnectFuture; import org.apache.mina.core.future.ConnectFuture;
import org.apache.mina.core.service.IoHandlerAdapter; import org.apache.mina.core.service.IoHandlerAdapter;
@@ -57,7 +55,6 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
private NioSocketConnector mSocketConnector; private NioSocketConnector mSocketConnector;
private AtomicBoolean mUpdating = new AtomicBoolean(); private AtomicBoolean mUpdating = new AtomicBoolean();
private Queue<String> mMetadataQueue = new LinkedTransferQueue<>(); private Queue<String> mMetadataQueue = new LinkedTransferQueue<>();
private Map<String, String> mHTTPHeaders;
private boolean mStackTraceLoggingSuppressed; private boolean mStackTraceLoggingSuppressed;
/** /**
@@ -116,9 +113,9 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
* and will remain in the update queue until the next metadata update is requested. However, this is a design * and will remain in the update queue until the next metadata update is requested. However, this is a design
* trade-off to avoid having a scheduled runnable repeatedly processing the update queue. * trade-off to avoid having a scheduled runnable repeatedly processing the update queue.
*/ */
public void update(AudioMetadata audioMetadata) public void update(Metadata metadata)
{ {
mMetadataQueue.offer(getSong(audioMetadata)); mMetadataQueue.offer(getSong(metadata));
if(mUpdating.compareAndSet(false, true)) if(mUpdating.compareAndSet(false, true))
{ {
@@ -182,52 +179,45 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
/** /**
* Creates the song information for a metadata update * Creates the song information for a metadata update
*/ */
private static String getSong(AudioMetadata audioMetadata) private static String getSong(Metadata metadata)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if(audioMetadata != null) if(metadata != null)
{ {
Metadata to = audioMetadata.getMetadata(MetadataType.TO); String to = metadata.getPrimaryAddressTo().getIdentifier();
sb.append("TO:"); sb.append("TO:");
if(to != null) if(metadata.getPrimaryAddressTo().hasAlias())
{ {
if(to.hasAlias()) sb.append(metadata.getPrimaryAddressTo().getAlias().getName());
{
sb.append(to.getAlias().getName());
} }
else else if(metadata.getPrimaryAddressTo().hasIdentifier())
{ {
sb.append(to.getValue()); sb.append(metadata.getPrimaryAddressTo().getIdentifier());
}
} }
else else
{ {
sb.append("UNKNOWN"); sb.append("UNKNOWN");
} }
Metadata from = audioMetadata.getMetadata(MetadataType.FROM);
sb.append(" FROM:"); sb.append(" FROM:");
if(from != null) if(metadata.getPrimaryAddressFrom().hasAlias())
{ {
sb.append(metadata.getPrimaryAddressFrom().getAlias().getName());
if(from.hasAlias())
{
sb.append(from.getAlias().getName());
} }
else else if(metadata.getPrimaryAddressFrom().hasIdentifier())
{ {
sb.append(from.getValue()); sb.append(metadata.getPrimaryAddressFrom().getIdentifier());
}
} }
else else
{ {
sb.append("UNKNOWN"); sb.append("UNKNOWN");
} }
} }
else else
{ {

View File

@@ -37,9 +37,7 @@ import audio.broadcast.shoutcast.v2.ultravox.UltravoxMessageFactory;
import audio.broadcast.shoutcast.v2.ultravox.UltravoxMessageType; import audio.broadcast.shoutcast.v2.ultravox.UltravoxMessageType;
import audio.broadcast.shoutcast.v2.ultravox.UltravoxMetadata; import audio.broadcast.shoutcast.v2.ultravox.UltravoxMetadata;
import audio.broadcast.shoutcast.v2.ultravox.UltravoxProtocolFactory; import audio.broadcast.shoutcast.v2.ultravox.UltravoxProtocolFactory;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import org.apache.mina.core.RuntimeIoException; import org.apache.mina.core.RuntimeIoException;
import org.apache.mina.core.future.ConnectFuture; import org.apache.mina.core.future.ConnectFuture;
@@ -122,7 +120,7 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
} }
@Override @Override
public void update(AudioMetadata metadata) public void update(Metadata metadata)
{ {
List<UltravoxMessage> metadataMessages = getMetadataMessages(metadata); List<UltravoxMessage> metadataMessages = getMetadataMessages(metadata);
@@ -242,7 +240,7 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
* @param metadata containing audio metadata tags and attributes * @param metadata containing audio metadata tags and attributes
* @return a sequence of CacheableXMLMetadata messages sufficient to carry the complete set of metadata * @return a sequence of CacheableXMLMetadata messages sufficient to carry the complete set of metadata
*/ */
private List<UltravoxMessage> getMetadataMessages(AudioMetadata metadata) private List<UltravoxMessage> getMetadataMessages(Metadata metadata)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -264,30 +262,22 @@ public class ShoutcastV2AudioBroadcaster extends AudioBroadcaster implements IBr
if(metadata != null) if(metadata != null)
{ {
Metadata to = metadata.getMetadata(MetadataType.TO); if(metadata.getPrimaryAddressTo().hasAlias())
if(to != null)
{ {
if(to.hasAlias()) sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getAlias().getName()));
{
sb.append(UltravoxMetadata.TITLE_2.asXML(to.getAlias().toString()));
} }
else else if(metadata.getPrimaryAddressTo().hasIdentifier())
{ {
sb.append(UltravoxMetadata.TITLE_2.asXML(to.getValue())); sb.append(UltravoxMetadata.TITLE_2.asXML(metadata.getPrimaryAddressTo().getIdentifier()));
}
} }
Metadata from = metadata.getMetadata(MetadataType.FROM); if(metadata.getPrimaryAddressFrom().hasAlias())
if(from != null)
{ {
if(from.hasAlias()) sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getAlias().getName()));
{
sb.append(UltravoxMetadata.TITLE_3.asXML("From: " + from.getAlias().toString()));
} }
else else if(metadata.getPrimaryAddressFrom().hasIdentifier())
{ {
sb.append(UltravoxMetadata.TITLE_3.asXML("From: " + from.getValue())); sb.append(UltravoxMetadata.TITLE_3.asXML("From:" + metadata.getPrimaryAddressFrom().getIdentifier()));
}
} }
} }
else else

View File

@@ -1,357 +0,0 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/
package audio.metadata;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
import alias.id.broadcast.BroadcastChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import alias.Alias;
import alias.id.priority.Priority;
public class AudioMetadata implements Listener<Metadata>
{
protected static final Logger mLog = LoggerFactory.getLogger(AudioMetadata.class);
private int mSource;
private Map<MetadataType, Metadata> mMetadata = new HashMap<>();
private boolean mUpdated = false;
/* Channel Selected == highest priority */
private boolean mSelected = false;
/* Call Priority */
private int mPriority = Priority.DEFAULT_PRIORITY;
/* Indicates if the overall source is recordable */
private boolean mSourceRecordable = false;
/* Indicates the current recordable state */
private boolean mRecordable = false;
/* Indicates the current streamable state */
private boolean mStreamable = false;
/* A unique identifier for this metadata */
private String mIdentifier;
public AudioMetadata(int source, boolean recordable)
{
mSource = source;
setIdentifier(mSource);
mSourceRecordable = recordable;
setRecordable(mSourceRecordable);
}
/**
* Returns a unique identifier for this audio metadata that contains the
* source id and optionally the TO metadata string.
*/
public String getIdentifier()
{
return mIdentifier;
}
public void setIdentifier(int source)
{
setIdentifier(source, null);
}
public void setIdentifier(int source, String id)
{
mIdentifier = "SRC:" + source + " ID:" + (id == null ? "UNKNOWN" : id);
mUpdated = true;
}
/**
* Returns a copy of the current audio metadata.
*/
public AudioMetadata copyOf()
{
AudioMetadata copy = new AudioMetadata(mSource, mSourceRecordable);
copy.mPriority = mPriority;
copy.mSelected = mSelected;
copy.mRecordable = mRecordable;
copy.mStreamable = mStreamable;
copy.mMetadata.putAll(mMetadata);
copy.mUpdated = mUpdated;
copy.mIdentifier = new String(mIdentifier);
mUpdated = false;
return copy;
}
/**
* Removes any accumulated temporal metadata and returns to a default set.
*/
public void reset()
{
//Reset recordable state, identifier and audio call priority levels and reprocess the metadata
mRecordable = mSourceRecordable;
mStreamable = false;
setIdentifier(mSource);
mPriority = Priority.DEFAULT_PRIORITY;
List<MetadataType> toRemove = new ArrayList<>();
for (MetadataType type : mMetadata.keySet())
{
Metadata metadata = mMetadata.get(type);
if (metadata != null)
{
if (metadata.isTemporal())
{
toRemove.add(type);
}
else
{
processMetadata(metadata);
}
}
}
for (MetadataType type : toRemove)
{
mMetadata.remove(type);
}
mUpdated = true;
}
private void processMetadata(Metadata metadata)
{
if (metadata.hasAlias())
{
Alias alias = metadata.getAlias();
if (metadata.getMetadataType() == MetadataType.FROM || metadata.getMetadataType() == MetadataType.TO)
{
if (!alias.isRecordable())
{
mRecordable = false;
}
if (alias.isStreamable())
{
mStreamable = true;
}
}
if (metadata.getMetadataType() == MetadataType.TO)
{
setIdentifier(mSource, metadata.getValue());
}
if (alias != null && alias.getCallPriority() < mPriority)
{
mPriority = alias.getCallPriority();
}
}
}
/**
* Indicates if this audio metadata contains updated information. The flag
* will only be set when new data is added and will be reset by a copyOf()
* method invocation.
*/
public boolean isUpdated()
{
return mUpdated;
}
public void setUpdated(boolean updated)
{
mUpdated = updated;
}
/**
* Adds the metadata. Any temporal metadata will be removed when the
* dispose() method is invoked.
*/
@Override
public void receive(Metadata metadata)
{
if (metadata.isReset())
{
reset();
}
else
{
Metadata existing = mMetadata.get(metadata.getMetadataType());
if (existing == null || !existing.equals(metadata))
{
mMetadata.put(metadata.getMetadataType(), metadata);
processMetadata(metadata);
setUpdated(true);
}
}
mUpdated = true;
}
/**
* Returns the complete set of metadata
*/
public Map<MetadataType, Metadata> getMetadata()
{
return mMetadata;
}
/**
* Returns the metadata object matching the type or null
*/
public Metadata getMetadata(MetadataType type)
{
return mMetadata.get(type);
}
/**
* Source channel ID
*/
public void setSource(int source)
{
mSource = source;
mUpdated = true;
}
public int getSource()
{
return mSource;
}
/**
* Sets the priority of this audio packet within the defined min/max priority range
*/
public void setPriority(int priority)
{
mPriority = priority;
mUpdated = true;
}
/**
* Returns the priority of this audio metadata
*
* @return - priority of audio packet where lower numbers are higher priority
*/
public int getPriority()
{
return mPriority;
}
public boolean isDoNotMonitor()
{
return mPriority == Priority.DO_NOT_MONITOR;
}
/**
* Selected audio channel. A selected channel will override the priority
* level so that the audio can be listened to immediately.
*/
public void setSelected(boolean selected)
{
mSelected = selected;
mUpdated = true;
}
public boolean isSelected()
{
return mSelected;
}
/**
* Indicates if audio associated with this metadata is recordable.
*/
public boolean isRecordable()
{
return mRecordable;
}
public void setRecordable(boolean recordable)
{
mRecordable = recordable;
mUpdated = true;
}
/**
* Indicates if the audio associated with this metadata is streamable
*/
public boolean isStreamable()
{
return mStreamable;
}
public Collection<BroadcastChannel> getBroadcastChannels()
{
Set<BroadcastChannel> broadcastChannels = new TreeSet<>();
for(Metadata metadata: mMetadata.values())
{
if(metadata.hasAlias() && metadata.getAlias().isStreamable())
{
Alias alias = metadata.getAlias();
broadcastChannels.addAll(alias.getBroadcastChannels());
}
}
return broadcastChannels;
}
public String toString()
{
StringBuilder sb = new StringBuilder();
sb.append("Audio Metadata - source:");
sb.append(getSource());
sb.append(" priority:");
sb.append(getPriority());
sb.append(" updated:" + isUpdated());
sb.append(" ");
for (Entry<MetadataType, Metadata> entry : getMetadata().entrySet())
{
sb.append(entry.getValue().getKey());
sb.append(":");
sb.append(entry.getValue().getValue());
sb.append(" ");
}
return sb.toString();
}
}

View File

@@ -1,8 +0,0 @@
package audio.metadata;
import sample.Listener;
public interface IMetadataListener
{
public Listener<Metadata> getMetadataListener();
}

View File

@@ -1,9 +0,0 @@
package audio.metadata;
import sample.Listener;
public interface IMetadataProvider
{
public void setMetadataListener( Listener<Metadata> listener );
public void removeMetadataListener();
}

View File

@@ -1,162 +0,0 @@
/*******************************************************************************
* SDR Trunk
* Copyright (C) 2014-2016 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/
package audio.metadata;
import alias.Alias;
public class Metadata
{
private MetadataType mMetadataType;
private String mValue;
private Alias mValueAlias;
private boolean mTemporal;
/**
* Constucts a metadata object with the temporal settings. Temporal
* indicates that this metadata will be removed at the end of a reset
* event, or call end event.
*/
public Metadata( MetadataType metadataType, String value, Alias alias, boolean temporal )
{
mMetadataType = metadataType;
mValue = value;
mValueAlias = alias;
mTemporal = temporal;
}
/**
* Constucts a metadata object with the temporal settings. Temporal
* indicates that this metadata will be removed at the end of a reset
* event, or call end event.
*/
public Metadata( MetadataType metadataType, String value, boolean temporal )
{
this( metadataType, value, null, temporal );
}
/**
* Constucts a non-temporal metadata object
*/
public Metadata( MetadataType metadataType, String value, Alias alias )
{
this( metadataType, value, alias, false );
}
/**
* Constucts a non-temporal metadata object
*/
public Metadata( MetadataType metadataType, String value )
{
this( metadataType, value, null, false );
}
public MetadataType getMetadataType()
{
return mMetadataType;
}
public String getKey()
{
return mMetadataType.getLabel();
}
public String getValue()
{
return mValue;
}
public Alias getAlias()
{
return mValueAlias;
}
public boolean hasAlias()
{
return mValueAlias != null;
}
/**
* Indicates that this piece of metadata is only valid for the duration of
* a call event and should be removed during a reset
*/
public boolean isTemporal()
{
return mTemporal;
}
public boolean isReset()
{
return false;
}
public String toString()
{
StringBuilder sb = new StringBuilder();
sb.append( mMetadataType.getLabel() );
sb.append( ":" );
sb.append( mValue );
sb.append( " Alias:" );
sb.append( mValueAlias == null ? "null" : getAlias().getName() );
sb.append( " [" );
sb.append( mMetadataType.name() );
sb.append( "] temporal:" );
sb.append( mTemporal );
return sb.toString();
}
public boolean equals( Metadata other )
{
if( mMetadataType != other.getMetadataType() )
{
return false;
}
if( mTemporal != other.isTemporal() )
{
return false;
}
if( mValue != null && other.getValue() != null &&
!mValue.contentEquals( other.getValue() ))
{
return false;
}
if( ( mValue == null && other.getValue() != null ) ||
( mValue != null && other.getValue() == null ) )
{
return false;
}
if( mValueAlias != null && other.getAlias() != null &&
!mValueAlias.getName().contentEquals( other.getAlias().getName() ))
{
return false;
}
if( ( mValueAlias == null && other.getAlias() != null ) ||
( mValueAlias != null && other.getAlias() == null ) )
{
return false;
}
return true;
}
}

View File

@@ -1,14 +0,0 @@
package audio.metadata;
public class MetadataReset extends Metadata
{
public MetadataReset()
{
super( MetadataType.TEMPORAL_RESET, "reset", true );
}
public boolean isReset()
{
return true;
}
}

View File

@@ -1,40 +0,0 @@
package audio.metadata;
public enum MetadataType
{
CHANNEL_NUMBER( "Channel Number" ),
CHANNEL_NAME( "Channel Name" ),
DETAILS( "Details" ),
ESN( "ESN" ),
FLEETSYNC( "Fleetsync" ),
FREQUENCY( "Frequency" ),
FROM( "From" ),
MDC1200( "MDC-1200" ),
MOBILE_ID( "Mobile ID" ),
MPT1327( "MPT-1327" ),
PROTOCOL( "Protocol" ),
SITE_ID( "Site ID" ),
STATUS( "Status" ),
SYSTEM( "System" ),
TO( "To" ),
UNIQUE_ID( "Unique ID" ),
TEMPORAL_RESET( "Reset" );
private String mLabel;
private MetadataType( String label )
{
mLabel = label;
}
public String getLabel()
{
return mLabel;
}
public String toString()
{
return mLabel;
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,16 +14,21 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package audio.output; package audio.output;
import java.nio.ByteBuffer; import audio.AudioEvent;
import java.util.ArrayList; import audio.AudioPacket;
import java.util.List; import audio.AudioPacket.Type;
import java.util.concurrent.LinkedTransferQueue; import channel.metadata.Metadata;
import java.util.concurrent.ScheduledFuture; import controller.ThreadPoolManager;
import java.util.concurrent.TimeUnit; import controller.ThreadPoolManager.ThreadType;
import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Listener;
import source.mixer.MixerChannel;
import javax.sound.sampled.AudioFormat; import javax.sound.sampled.AudioFormat;
import javax.sound.sampled.BooleanControl; import javax.sound.sampled.BooleanControl;
@@ -35,19 +40,13 @@ import javax.sound.sampled.LineListener;
import javax.sound.sampled.LineUnavailableException; import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.Mixer; import javax.sound.sampled.Mixer;
import javax.sound.sampled.SourceDataLine; import javax.sound.sampled.SourceDataLine;
import java.nio.ByteBuffer;
import org.slf4j.Logger; import java.util.ArrayList;
import org.slf4j.LoggerFactory; import java.util.List;
import java.util.concurrent.LinkedTransferQueue;
import sample.Broadcaster; import java.util.concurrent.ScheduledFuture;
import sample.Listener; import java.util.concurrent.TimeUnit;
import source.mixer.MixerChannel; import java.util.concurrent.atomic.AtomicBoolean;
import audio.AudioEvent;
import audio.AudioPacket;
import audio.AudioPacket.Type;
import audio.metadata.AudioMetadata;
import controller.ThreadPoolManager;
import controller.ThreadPoolManager.ThreadType;
public abstract class AudioOutput implements Listener<AudioPacket>, LineListener public abstract class AudioOutput implements Listener<AudioPacket>, LineListener
{ {
@@ -57,7 +56,7 @@ public abstract class AudioOutput implements Listener<AudioPacket>, LineListener
private int mBufferStartThreshold; private int mBufferStartThreshold;
private int mBufferStopThreshold; private int mBufferStopThreshold;
private Listener<AudioMetadata> mAudioMetadataListener; private Listener<Metadata> mMetadataListener;
private Broadcaster<AudioEvent> mAudioEventBroadcaster = new Broadcaster<>(); private Broadcaster<AudioEvent> mAudioEventBroadcaster = new Broadcaster<>();
private ThreadPoolManager mThreadPoolManager; private ThreadPoolManager mThreadPoolManager;
@@ -183,7 +182,7 @@ public abstract class AudioOutput implements Listener<AudioPacket>, LineListener
mAudioEventBroadcaster.dispose(); mAudioEventBroadcaster.dispose();
mAudioEventBroadcaster = null; mAudioEventBroadcaster = null;
mAudioMetadataListener = null; mMetadataListener = null;
if(mOutput != null) if(mOutput != null)
{ {
@@ -242,24 +241,24 @@ public abstract class AudioOutput implements Listener<AudioPacket>, LineListener
* Registers a single listener to receive the audio metadata from each * Registers a single listener to receive the audio metadata from each
* audio packet * audio packet
*/ */
public void setAudioMetadataListener( Listener<AudioMetadata> listener ) public void setMetadataListener(Listener<Metadata> listener)
{ {
mAudioMetadataListener = listener; mMetadataListener = listener;
} }
public void removeAudioMetadataListener() public void removeAudioMetadataListener()
{ {
mAudioMetadataListener = null; mMetadataListener = null;
} }
/** /**
* Broadcasts audio metadata to the registered listener * Broadcasts audio metadata to the registered listener
*/ */
private void broadcast( AudioMetadata metadata ) private void broadcast(Metadata metadata)
{ {
if( mAudioMetadataListener != null ) if(mMetadataListener != null)
{ {
mAudioMetadataListener.receive( metadata ); mMetadataListener.receive(metadata);
} }
} }
@@ -317,7 +316,7 @@ public abstract class AudioOutput implements Listener<AudioPacket>, LineListener
{ {
if(packet.getType() == Type.AUDIO) if(packet.getType() == Type.AUDIO)
{ {
broadcast( packet.getAudioMetadata() ); broadcast(packet.getMetadata());
ByteBuffer buffer = convert(packet); ByteBuffer buffer = convert(packet);

View File

@@ -23,7 +23,7 @@ public enum Attribute
CHANNEL_CONFIGURATION_LABEL_1, CHANNEL_CONFIGURATION_LABEL_1,
CHANNEL_CONFIGURATION_LABEL_2, CHANNEL_CONFIGURATION_LABEL_2,
CHANNEL_FREQUENCY, CHANNEL_FREQUENCY,
CHANNEL_ID, CHANNEL_FREQUENCY_LABEL,
CHANNEL_STATE, CHANNEL_STATE,
MESSAGE, MESSAGE,
MESSAGE_TYPE, MESSAGE_TYPE,
@@ -31,32 +31,7 @@ public enum Attribute
NETWORK_ID_2, NETWORK_ID_2,
PRIMARY_ADDRESS_FROM, PRIMARY_ADDRESS_FROM,
PRIMARY_ADDRESS_TO, PRIMARY_ADDRESS_TO,
PRIMARY_DECODER_TYPE,
SECONDARY_ADDRESS_FROM, SECONDARY_ADDRESS_FROM,
SECONDARY_ADDRESS_TO, SECONDARY_ADDRESS_TO,
//TODO: remove all attributes below here ********************
CHANNEL_NUMBER,
CHANNEL_NAME,
CHANNEL_SITE_NUMBER,
CHANNEL_SITE_NUMBER_ALIAS,
DESCRIPTION,
FROM_TALKGROUP,
FROM_TALKGROUP_ALIAS,
FROM_TALKGROUP_TYPE,
NAC,
SITE,
SITE_ALIAS,
SITE_NAME,
SOURCE,
SYSTEM,
SYSTEM_NAME,
TO_TALKGROUP,
TO_TALKGROUP_ALIAS,
TO_TALKGROUP_TYPE;
} }

View File

@@ -19,6 +19,7 @@
package channel.metadata; package channel.metadata;
import alias.Alias; import alias.Alias;
import module.decode.DecoderType;
public class AttributeChangeRequest<T> public class AttributeChangeRequest<T>
{ {
@@ -89,6 +90,9 @@ public class AttributeChangeRequest<T>
return mAlias != null; return mAlias != null;
} }
/**
* Returns the value as a String or null if the value is not a String instance.
*/
public String getStringValue() public String getStringValue()
{ {
if(mValue instanceof String) if(mValue instanceof String)
@@ -99,6 +103,9 @@ public class AttributeChangeRequest<T>
return null; return null;
} }
/**
* Returns the value as a Long or null if the value is not a Long instance.
*/
public Long getLongValue() public Long getLongValue()
{ {
if(mValue instanceof Long) if(mValue instanceof Long)
@@ -108,4 +115,17 @@ public class AttributeChangeRequest<T>
return null; return null;
} }
/**
* Returns the value as a DecoderType or null if the value is not a DecoderType instance.
*/
public DecoderType getDecoderTypeValue()
{
if(mValue instanceof DecoderType)
{
return (DecoderType)mValue;
}
return null;
}
} }

View File

@@ -111,7 +111,7 @@ public class ChannelMetadataModel extends AbstractTableModel implements Listener
fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION); fireTableCellUpdated(rowIndex, COLUMN_CONFIGURATION);
break; break;
case CHANNEL_FREQUENCY: case CHANNEL_FREQUENCY:
case CHANNEL_ID: case CHANNEL_FREQUENCY_LABEL:
fireTableCellUpdated(rowIndex, COLUMN_FREQUENCY); fireTableCellUpdated(rowIndex, COLUMN_FREQUENCY);
break; break;
case CHANNEL_STATE: case CHANNEL_STATE:

View File

@@ -20,42 +20,86 @@ package channel.metadata;
import com.jidesoft.swing.JideSplitPane; import com.jidesoft.swing.JideSplitPane;
import com.jidesoft.swing.JideTabbedPane; import com.jidesoft.swing.JideTabbedPane;
import controller.channel.ChannelProcessingManager;
import icon.IconManager;
import icon.IconTableModel; import icon.IconTableModel;
import module.decode.event.CallEventPanel;
import module.decode.event.MessageActivityPanel;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import settings.SettingsManager;
import spectrum.ChannelSpectrumPanel;
import javax.swing.*; import javax.swing.*;
public class ChannelMetadataViewer extends JPanel public class ChannelMetadataViewer extends JPanel
{ {
private ChannelMetadataModel mChannelMetadataModel; private CallEventPanel mCallEventPanel;
private IconTableModel mIconTableModel; private MessageActivityPanel mMessageActivityPanel;
private ChannelSpectrumPanel mChannelSpectrumPanel;
private ChannelMetadataPanel mChannelMetadataPanel;
/** /**
* GUI panel that combines the currently decoding channels metadata table and viewers for channel details, * GUI panel that combines the currently decoding channels metadata table and viewers for channel details,
* messages, events, and spectral view. * messages, events, and spectral view.
*/ */
public ChannelMetadataViewer(ChannelMetadataModel channelMetadataModel, IconTableModel iconTableModel) public ChannelMetadataViewer(ChannelProcessingManager channelProcessingManager, IconManager iconManager,
SettingsManager settingsManager)
{ {
mChannelMetadataModel = channelMetadataModel; mCallEventPanel = new CallEventPanel(iconManager, channelProcessingManager);
mIconTableModel = iconTableModel; mMessageActivityPanel = new MessageActivityPanel(channelProcessingManager);
mChannelSpectrumPanel = new ChannelSpectrumPanel(settingsManager, channelProcessingManager);
mChannelMetadataPanel = new ChannelMetadataPanel(channelProcessingManager.getChannelMetadataModel(),
iconManager.getModel());
} }
private void init() private void init()
{ {
setLayout( new MigLayout( "", "[grow,fill]", "[grow,fill]") ); setLayout( new MigLayout( "", "[grow,fill]", "[grow,fill]") );
ChannelMetadataPanel channelMetadataPanel = new ChannelMetadataPanel(mChannelMetadataModel, mIconTableModel);
JideTabbedPane tabbedPane = new JideTabbedPane(); JideTabbedPane tabbedPane = new JideTabbedPane();
tabbedPane.addTab("Details", new JPanel()); tabbedPane.addTab("Details", new JPanel());
tabbedPane.addTab("Events", new JPanel()); tabbedPane.addTab("Events", mCallEventPanel);
tabbedPane.addTab("Messages", new JPanel()); tabbedPane.addTab("Messages", mMessageActivityPanel);
tabbedPane.addTab("Spectrum", new JPanel()); tabbedPane.addTab("Spectrum", mChannelSpectrumPanel);
JideSplitPane splitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT); JideSplitPane splitPane = new JideSplitPane(JideSplitPane.VERTICAL_SPLIT);
splitPane.add(channelMetadataPanel); splitPane.add(mChannelMetadataPanel);
splitPane.add(tabbedPane); splitPane.add(tabbedPane);
//TODO: move this change listener to the metadata table view
// /**
// * Change listener to enable/disable the channel spectrum display
// * only when the tab is visible, and a channel has been selected
// */
// mTabbedPane.addChangeListener(new ChangeListener()
// {
// @Override
// public void stateChanged(ChangeEvent event)
// {
// int index = mTabbedPane.getSelectedIndex();
//
// Component component = mTabbedPane.getComponentAt(index);
//
// if(component instanceof ChannelSpectrumPanel)
// {
// mChannelSpectrumPanel.setEnabled(true);
// }
// else
// {
// mChannelSpectrumPanel.setEnabled(false);
// }
// }
// });
//TODO: call, message and spectrum should listen to the metadata table now
//
//
// /* Register each of the components to receive channel events when the
// * channels are selected or change */
// mChannelModel.addListener(mCallEventPanel);
// mChannelModel.addListener(mChannelSpectrumPanel);
// mChannelModel.addListener(mMessageActivityPanel);
add(splitPane); add(splitPane);
} }
} }

View File

@@ -54,7 +54,7 @@ public class Metadata
//Lazily constructed member variables. //Lazily constructed member variables.
private Integer mAudioPriority; private Integer mAudioPriority;
private Boolean mRecordable; protected Boolean mRecordable;
private List<BroadcastChannel> mBroadcastChannels; private List<BroadcastChannel> mBroadcastChannels;
@@ -237,7 +237,7 @@ public class Metadata
return mChannelConfigurationLabel1; return mChannelConfigurationLabel1;
case CHANNEL_CONFIGURATION_LABEL_2: case CHANNEL_CONFIGURATION_LABEL_2:
return mChannelConfigurationLabel2; return mChannelConfigurationLabel2;
case CHANNEL_ID: case CHANNEL_FREQUENCY_LABEL:
return mChannelFrequencyLabel; return mChannelFrequencyLabel;
case CHANNEL_STATE: case CHANNEL_STATE:
return mState.getDisplayValue(); return mState.getDisplayValue();

View File

@@ -47,6 +47,15 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
public void setSelected(boolean selected) public void setSelected(boolean selected)
{ {
mSelected = selected; mSelected = selected;
mUpdated = true;
}
/**
* Sets the recordable flag to the argument value and overrides any recordable settings in the enclosed aliases.
*/
public void setRecordable(boolean recordable)
{
mRecordable = recordable;
} }
/** /**
@@ -55,6 +64,7 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
public void setPrimaryDecoderType(DecoderType decoderType) public void setPrimaryDecoderType(DecoderType decoderType)
{ {
mPrimaryDecoderType = decoderType; mPrimaryDecoderType = decoderType;
mUpdated = true;
} }
/** /**
@@ -85,9 +95,9 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
} }
broadcast(Attribute.CHANNEL_FREQUENCY); broadcast(Attribute.CHANNEL_FREQUENCY);
break; break;
case CHANNEL_ID: case CHANNEL_FREQUENCY_LABEL:
mChannelFrequencyLabel = request.getStringValue(); mChannelFrequencyLabel = request.getStringValue();
broadcast(Attribute.CHANNEL_ID); broadcast(Attribute.CHANNEL_FREQUENCY_LABEL);
break; break;
case MESSAGE: case MESSAGE:
mMessage = request.getStringValue(); mMessage = request.getStringValue();
@@ -117,6 +127,10 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
mPrimaryAddressTo.setAlias(request.getAlias()); mPrimaryAddressTo.setAlias(request.getAlias());
broadcast(Attribute.PRIMARY_ADDRESS_TO); broadcast(Attribute.PRIMARY_ADDRESS_TO);
break; break;
case PRIMARY_DECODER_TYPE:
mPrimaryDecoderType = request.getDecoderTypeValue();
broadcast(Attribute.PRIMARY_DECODER_TYPE);
break;
case SECONDARY_ADDRESS_FROM: case SECONDARY_ADDRESS_FROM:
mSecondaryAddressFrom.setIdentifier(request.getStringValue()); mSecondaryAddressFrom.setIdentifier(request.getStringValue());
mSecondaryAddressFrom.setAlias(request.getAlias()); mSecondaryAddressFrom.setAlias(request.getAlias());
@@ -135,6 +149,8 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
throw new IllegalArgumentException("Unrecognized Metadata Attribute: " + throw new IllegalArgumentException("Unrecognized Metadata Attribute: " +
request.getAttribute().name()); request.getAttribute().name());
} }
mUpdated = true;
} }
/** /**
@@ -178,6 +194,8 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
mSecondaryAddressTo.reset(); mSecondaryAddressTo.reset();
broadcast(Attribute.SECONDARY_ADDRESS_TO); broadcast(Attribute.SECONDARY_ADDRESS_TO);
} }
mUpdated = true;
} }
/** /**
@@ -202,7 +220,7 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
if(hasChannelFrequencyLabel()) if(hasChannelFrequencyLabel())
{ {
mChannelFrequencyLabel = null; mChannelFrequencyLabel = null;
broadcast(Attribute.CHANNEL_ID); broadcast(Attribute.CHANNEL_FREQUENCY_LABEL);
} }
if(hasChannelFrequency()) if(hasChannelFrequency())
@@ -211,6 +229,12 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
broadcast(Attribute.CHANNEL_FREQUENCY); broadcast(Attribute.CHANNEL_FREQUENCY);
} }
if(hasPrimaryDecoderType())
{
mPrimaryDecoderType = null;
broadcast(Attribute.PRIMARY_DECODER_TYPE);
}
if(mNetworkID1.hasIdentifier()) if(mNetworkID1.hasIdentifier())
{ {
mNetworkID1.reset(); mNetworkID1.reset();
@@ -222,6 +246,8 @@ public class MutableMetadata extends Metadata implements Listener<AttributeChang
mNetworkID2.reset(); mNetworkID2.reset();
broadcast(Attribute.NETWORK_ID_2); broadcast(Attribute.NETWORK_ID_2);
} }
mUpdated = true;
} }

View File

@@ -1,317 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package channel.state;
import audio.AudioPanel;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import icon.IconManager;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting.ColorSettingName;
import settings.ColorSettingMenuItem;
import settings.ColorSettingResetMenuItem;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Gui wrapper for the list of currently processing primary channels
*/
public class ChannelList extends JPanel implements ChannelEventListener
{
private static final long serialVersionUID = 1L;
private Map<Channel, ChannelPanel> mDisplayedPanels = new ConcurrentHashMap<>();
private ChannelModel mChannelModel;
private ChannelProcessingManager mChannelProcessingManager;
private IconManager mIconManager;
private SettingsManager mSettingsManager;
private AudioPanel mAudioPanel;
public ChannelList(ChannelModel channelModel,
ChannelProcessingManager channelProcessingManager,
IconManager iconManager,
SettingsManager settingsManager,
AudioPanel audioPanel)
{
mChannelModel = channelModel;
mChannelProcessingManager = channelProcessingManager;
mIconManager = iconManager;
mSettingsManager = settingsManager;
mAudioPanel = audioPanel;
init();
}
private void init()
{
setLayout(new MigLayout("insets 0 0 0 0,wrap 1", "[grow,fill]", "[]0[]"));
setBackground(Color.BLACK);
addMouseListener(new ListSelectionListener());
add(mAudioPanel);
JSeparator separator = new JSeparator(JSeparator.HORIZONTAL);
add(separator);
}
@Override
public void channelChanged(ChannelEvent event)
{
switch(event.getEvent())
{
case NOTIFICATION_PROCESSING_START:
addChannelPanel(event.getChannel());
break;
case NOTIFICATION_PROCESSING_STOP:
removeChannelPanel(event.getChannel());
break;
default:
break;
}
}
private void addChannelPanel(Channel channel)
{
if(!mDisplayedPanels.containsKey(channel))
{
ChannelPanel channelPanel = new ChannelPanel(mChannelModel,
mChannelProcessingManager, mIconManager, mSettingsManager, channel);
add(channelPanel);
mDisplayedPanels.put(channel, channelPanel);
revalidate();
repaint();
}
}
public void removeChannelPanel(Channel channel)
{
if(mDisplayedPanels.containsKey(channel))
{
ChannelPanel panel = mDisplayedPanels.remove(channel);
if(panel != null)
{
remove(panel);
panel.dispose();
}
revalidate();
repaint();
}
}
public class ListSelectionListener implements MouseListener
{
@Override
public void mouseClicked(MouseEvent e)
{
Component component = getComponentAt(e.getPoint());
if(component instanceof ChannelPanel)
{
ChannelPanel panel = (ChannelPanel) component;
Channel channel = panel.getChannel();
if(e.getButton() == MouseEvent.BUTTON1)
{
if(channel.isSelected())
{
mChannelModel.broadcast(new ChannelEvent(channel, Event.REQUEST_DESELECT));
}
else
{
mChannelModel.broadcast(new ChannelEvent(channel, Event.REQUEST_SELECT));
}
}
else if(e.getButton() == MouseEvent.BUTTON3)
{
JPopupMenu popupMenu = new JPopupMenu();
JMenu menu = panel.getContextMenu();
if(menu != null)
{
popupMenu.add(menu);
}
JMenu colorMenu = new JMenu("Color");
popupMenu.add(colorMenu);
JMenu backgroundMenu = new JMenu("Background");
colorMenu.add(backgroundMenu);
backgroundMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_BACKGROUND));
backgroundMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_BACKGROUND));
JMenu channelsMenu = new JMenu("Channel State");
colorMenu.add(channelsMenu);
JMenu callMenu = new JMenu("Call");
channelsMenu.add(callMenu);
callMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_CALL));
callMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_CALL));
callMenu.add(new JSeparator());
callMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_CALL));
callMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_CALL));
JMenu controlMenu = new JMenu("Control");
channelsMenu.add(controlMenu);
controlMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_CONTROL));
controlMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_CONTROL));
controlMenu.add(new JSeparator());
controlMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_CONTROL));
controlMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_CONTROL));
JMenu dataMenu = new JMenu("Data");
channelsMenu.add(dataMenu);
dataMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_DATA));
dataMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_DATA));
dataMenu.add(new JSeparator());
dataMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_DATA));
dataMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_DATA));
JMenu fadeMenu = new JMenu("Fade");
channelsMenu.add(fadeMenu);
fadeMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_FADE));
fadeMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_FADE));
fadeMenu.add(new JSeparator());
fadeMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_FADE));
fadeMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_FADE));
JMenu idleMenu = new JMenu("Idle");
channelsMenu.add(idleMenu);
idleMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_IDLE));
idleMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_IDLE));
idleMenu.add(new JSeparator());
idleMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_IDLE));
idleMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_IDLE));
JMenu noTunerMenu = new JMenu("No Tuner");
channelsMenu.add(noTunerMenu);
noTunerMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER));
noTunerMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER));
noTunerMenu.add(new JSeparator());
noTunerMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_NO_TUNER));
noTunerMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_NO_TUNER));
JMenu labelMenu = new JMenu("Labels");
colorMenu.add(labelMenu);
labelMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER));
labelMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER));
labelMenu.add(new JSeparator());
labelMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_LABEL_DECODER));
labelMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_LABEL_DECODER));
labelMenu.add(new JSeparator());
labelMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_LABEL_DETAILS));
labelMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_LABEL_DETAILS));
JMenu selectedMenu = new JMenu("Selected");
colorMenu.add(selectedMenu);
selectedMenu.add(new ColorSettingMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_SELECTED_CHANNEL));
selectedMenu.add(new ColorSettingResetMenuItem(mSettingsManager,
ColorSettingName.CHANNEL_STATE_SELECTED_CHANNEL));
popupMenu.show(ChannelList.this, e.getX(), e.getY());
}
}
}
public void mousePressed(MouseEvent e)
{
}
public void mouseReleased(MouseEvent e)
{
}
public void mouseEntered(MouseEvent e)
{
}
public void mouseExited(MouseEvent e)
{
}
}
}

View File

@@ -1,466 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package channel.state;
import channel.metadata.Attribute;
import controller.channel.Channel;
import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event;
import controller.channel.ChannelEventListener;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.ChannelUtils;
import icon.IconManager;
import module.ProcessingChain;
import module.decode.DecoderFactory;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.RecorderType;
import record.config.RecordConfiguration;
import sample.Listener;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingChangeListener;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
import java.util.ArrayList;
import java.util.List;
public class ChannelPanel extends JPanel
implements Listener<Attribute>,
SettingChangeListener,
ChannelEventListener
{
private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger(ChannelPanel.class);
private Font mFontDetails = new Font(Font.MONOSPACED, Font.PLAIN, 12);
private Font mFontDecoder = new Font(Font.MONOSPACED, Font.PLAIN, 12);
protected Color mColorChannelBackground;
protected Color mColorChannelSelected;
protected Color mColorTopCall;
protected Color mColorMiddleCall;
protected Color mColorTopControl;
protected Color mColorMiddleControl;
protected Color mColorTopData;
protected Color mColorMiddleData;
protected Color mColorTopFade;
protected Color mColorMiddleFade;
protected Color mColorTopIdle;
protected Color mColorMiddleIdle;
protected Color mColorTopNoTuner;
protected Color mColorMiddleNoTuner;
protected Color mColorLabelDetails;
protected Color mColorLabelDecoder;
protected Color mColorLabelAuxDecoder;
private JLabel mStateLabel;
private JLabel mSourceLabel;
private JLabel mOptionsLabel;
private JLabel mSystemLabel;
private JLabel mSiteLabel;
private JLabel mChannelLabel;
protected SettingsManager mSettingsManager;
protected IconManager mIconManager;
private Channel mChannel;
private ChannelState mChannelState;
private List<DecoderPanel> mDecoderPanels = new ArrayList<>();
private ChannelModel mChannelModel;
private ChannelProcessingManager mChannelProcessingManager;
/**
* Gui component to a channel state. Provides System, Site and channel
* name, source and channel state visualization.
*
* Updates color background according to current channel state.
*/
public ChannelPanel(ChannelModel channelModel,
ChannelProcessingManager channelProcessingManager,
IconManager iconManager,
SettingsManager settingsManager,
Channel channel)
{
mChannelModel = channelModel;
mChannelProcessingManager = channelProcessingManager;
mIconManager = iconManager;
mSettingsManager = settingsManager;
mChannel = channel;
ProcessingChain processingChain =
channelProcessingManager.getProcessingChain(mChannel);
if(processingChain != null)
{
mChannelState = processingChain.getChannelState();
init();
for(DecoderState decoderState : processingChain.getDecoderStates())
{
DecoderPanel panel = DecoderFactory.getDecoderPanel(mIconManager, mSettingsManager, decoderState);
mDecoderPanels.add(panel);
add(panel, "grow,span");
}
mChannelState.setChangedAttributeListener(this);
mChannelModel.addListener(this);
mSettingsManager.addListener(this);
}
else
{
mLog.error("Processing Chain was null!");
}
}
private void init()
{
getColors();
setLayout(new MigLayout("insets 1 1 1 1", "[grow,fill]", "[]0[]0[]"));
mSystemLabel = new JLabel(mChannel.getSystem());
mSystemLabel.setFont(mFontDetails);
mSystemLabel.setForeground(mColorLabelDetails);
add(mSystemLabel);
mSiteLabel = new JLabel(mChannel.getSite());
mSiteLabel.setFont(mFontDetails);
mSiteLabel.setForeground(mColorLabelDetails);
add(mSiteLabel);
mChannelLabel = new JLabel(mChannel.getName());
mChannelLabel.setFont(mFontDetails);
mChannelLabel.setForeground(mColorLabelDetails);
add(mChannelLabel, "wrap");
mStateLabel = new JLabel(mChannelState.getState().getDisplayValue());
mStateLabel.setFont(mFontDecoder);
mStateLabel.setForeground(mColorLabelDecoder);
add(mStateLabel);
mSourceLabel = new JLabel(mChannel.getSourceConfiguration().getDescription());
mSourceLabel.setFont(mFontDetails);
mSourceLabel.setForeground(mColorLabelDetails);
add(mSourceLabel);
StringBuilder sb = new StringBuilder();
if(!mChannel.getEventLogConfiguration().getLoggers().isEmpty())
{
sb.append("LOG ");
}
RecordConfiguration recordConfig = mChannel.getRecordConfiguration();
if(recordConfig.getRecorders().contains(RecorderType.AUDIO))
{
sb.append("AUDIO ");
}
if(recordConfig.getRecorders().contains(RecorderType.BASEBAND) ||
recordConfig.getRecorders().contains(RecorderType.TRAFFIC_BASEBAND))
{
sb.append("BASEBAND");
}
mOptionsLabel = new JLabel(sb.toString());
mOptionsLabel.setFont(mFontDetails);
mOptionsLabel.setForeground(mColorLabelAuxDecoder);
add(mOptionsLabel, "wrap");
}
public Channel getChannel()
{
return mChannel;
}
public void dispose()
{
mChannelModel.removeListener(this);
mChannelModel = null;
mChannelProcessingManager = null;
mSettingsManager.removeListener(this);
mSettingsManager = null;
mChannelState.removeChangedAttributeListener();
mChannelState = null;
mChannel = null;
for(DecoderPanel panel : mDecoderPanels)
{
panel.dispose();
remove(panel);
}
mDecoderPanels.clear();
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case CHANNEL_STATE:
if(mChannelState != null && mChannelState.getState() != null)
{
mStateLabel.setText(mChannelState.getState().getDisplayValue());
}
break;
case SOURCE:
mSourceLabel.setText(mChannel.getSourceConfiguration()
.getDescription());
break;
case CHANNEL_NAME:
case SITE_NAME:
case SYSTEM_NAME:
mChannelLabel.setText(mChannel.toString());
break;
default:
break;
}
repaint();
}
});
}
@Override
protected void paintComponent(Graphics g)
{
super.paintComponent(g);
setBackground(mColorChannelBackground);
Graphics2D g2 = (Graphics2D) g.create();
Paint p = null;
final Channel channel = mChannel;
if(mChannelState != null)
{
switch(mChannelState.getState())
{
case CALL:
p = getGradient(mColorTopCall, mColorMiddleCall);
break;
case CONTROL:
p = getGradient(mColorTopControl, mColorMiddleControl);
break;
case DATA:
p = getGradient(mColorTopData, mColorMiddleData);
break;
case FADE:
p = getGradient(mColorTopFade, mColorMiddleFade);
break;
case IDLE:
default:
p = getGradient(mColorTopIdle, mColorMiddleIdle);
break;
}
}
if(p == null)
{
p = getGradient(mColorTopIdle, mColorMiddleIdle);
}
g2.setPaint(p);
g2.fillRect(0, 0, getWidth(), getHeight());
/* Draw bottom separator line */
g2.setColor(Color.LIGHT_GRAY);
g2.drawLine(0, getHeight() - 1, getWidth(), getHeight() - 1);
/* Draw channel selected box */
if(getChannel() != null && getChannel().isSelected())
{
g2.setColor(mColorChannelSelected);
g2.drawRect(1, 1, getWidth() - 2, getHeight() - 2);
}
g2.dispose();
}
private void getColors()
{
mColorChannelBackground = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_BACKGROUND).getColor();
mColorChannelSelected = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_SELECTED_CHANNEL).getColor();
mColorTopCall = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_CALL).getColor();
mColorMiddleCall = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_CALL).getColor();
mColorTopControl = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_CONTROL).getColor();
mColorMiddleControl = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_CONTROL).getColor();
mColorTopData = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_DATA).getColor();
mColorMiddleData = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_DATA).getColor();
mColorTopFade = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_FADE).getColor();
mColorMiddleFade = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_FADE).getColor();
mColorTopIdle = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_IDLE).getColor();
mColorMiddleIdle = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_IDLE).getColor();
mColorTopNoTuner = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_TOP_NO_TUNER).getColor();
mColorMiddleNoTuner = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER).getColor();
mColorLabelDetails = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_LABEL_DETAILS).getColor();
mColorLabelDecoder = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_LABEL_DECODER).getColor();
mColorLabelAuxDecoder = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER).getColor();
}
private GradientPaint getGradient(Color top, Color middle)
{
return new GradientPaint(0f, -50.0f, top,
0f, (float) getHeight() / 2.2f, middle, true);
}
@Override
public void settingChanged(Setting setting)
{
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_BACKGROUND:
mColorChannelBackground = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_MIDDLE_CALL:
mColorMiddleCall = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_TOP_CALL:
mColorTopCall = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_MIDDLE_CONTROL:
mColorMiddleControl = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_TOP_CONTROL:
mColorTopControl = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_MIDDLE_DATA:
mColorMiddleData = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_TOP_DATA:
mColorTopData = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_MIDDLE_FADE:
mColorMiddleFade = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_TOP_FADE:
mColorTopFade = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_MIDDLE_IDLE:
mColorMiddleIdle = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_TOP_IDLE:
mColorTopIdle = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_MIDDLE_NO_TUNER:
mColorMiddleNoTuner = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_GRADIENT_TOP_NO_TUNER:
mColorTopNoTuner = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_LABEL_AUX_DECODER:
mColorLabelAuxDecoder = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_LABEL_DECODER:
mColorLabelDecoder = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_LABEL_DETAILS:
mColorLabelDetails = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_SELECTED_CHANNEL:
mColorChannelSelected = colorSetting.getColor();
repaint();
break;
default:
break;
}
}
}
@Override
public void settingDeleted(Setting setting)
{
}
public JMenu getContextMenu()
{
return ChannelUtils.getContextMenu(mChannelModel, mChannelProcessingManager,
mChannel, ChannelPanel.this);
}
@Override
public void channelChanged(ChannelEvent event)
{
if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
event.getChannel() == mChannel)
{
repaint();
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,57 +14,52 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package channel.state; package channel.state;
import audio.squelch.ISquelchStateProvider;
import audio.squelch.SquelchState;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.metadata.IAttributeChangeRequestListener;
import channel.metadata.MutableMetadata;
import channel.state.DecoderStateEvent.Event;
import channel.traffic.TrafficChannelManager;
import controller.channel.Channel.ChannelType;
import module.Module;
import module.decode.DecoderType;
import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.ICallEventProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import channel.metadata.Attribute; public class ChannelState extends Module implements ICallEventProvider, IDecoderStateEventListener,
import channel.metadata.AttributeChangeRequest; IDecoderStateEventProvider, ISquelchStateProvider, IAttributeChangeRequestListener
import channel.metadata.IAttributeChangeRequestListener;
import channel.metadata.MutableMetadata;
import channel.traffic.TrafficChannelManager;
import module.Module;
import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.ICallEventProvider;
import channel.state.DecoderStateEvent.Event;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import audio.metadata.IMetadataProvider;
import audio.metadata.Metadata;
import audio.metadata.MetadataReset;
import audio.metadata.MetadataType;
import audio.squelch.ISquelchStateProvider;
import audio.squelch.SquelchState;
import controller.channel.Channel.ChannelType;
public class ChannelState extends Module implements ICallEventProvider, IChangedAttributeProvider,
IDecoderStateEventListener, IDecoderStateEventProvider, IMetadataProvider, ISquelchStateProvider,
IAttributeChangeRequestListener
{ {
private final static Logger mLog = private final static Logger mLog = LoggerFactory.getLogger(ChannelState.class);
LoggerFactory.getLogger( ChannelState.class );
public static final long FADE_TIMEOUT_DELAY = 1200; public static final long FADE_TIMEOUT_DELAY = 1200;
public static final long RESET_TIMEOUT_DELAY = 2000; public static final long RESET_TIMEOUT_DELAY = 2000;
private MutableMetadata mMutableMetadata = new MutableMetadata(); private MutableMetadata mMutableMetadata = new MutableMetadata();
private State mState = State.IDLE; private State mState = State.IDLE;
private Listener<CallEvent> mCallEventListener; private Listener<CallEvent> mCallEventListener;
private Listener<Attribute> mChangedAttributeListener;
private Listener<DecoderStateEvent> mDecoderStateListener; private Listener<DecoderStateEvent> mDecoderStateListener;
private Listener<Metadata> mMetadataListener;
private Listener<SquelchState> mSquelchStateListener; private Listener<SquelchState> mSquelchStateListener;
private DecoderStateEventReceiver mDecoderStateEventReceiver = private DecoderStateEventReceiver mDecoderStateEventReceiver = new DecoderStateEventReceiver();
new DecoderStateEventReceiver(); private StateMonitor mStateMonitor = new StateMonitor();
private ScheduledFuture<?> mStateMonitorFuture;
private ChannelType mChannelType;
private TrafficChannelManager mTrafficChannelEndListener;
private CallEvent mTrafficChannelCallEvent;
private boolean mSquelchLocked = false; private boolean mSquelchLocked = false;
private boolean mSelected = false; private boolean mSelected = false;
@@ -74,13 +69,6 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
private long mFadeTimeout; private long mFadeTimeout;
private long mEndTimeout; private long mEndTimeout;
private StateMonitor mStateMonitor = new StateMonitor();
private ScheduledFuture<?> mStateMonitorFuture;
private ChannelType mChannelType;
private TrafficChannelManager mTrafficChannelEndListener;
private CallEvent mTrafficChannelCallEvent;
/** /**
* Channel state tracks the overall state of all processing modules and decoders * Channel state tracks the overall state of all processing modules and decoders
@@ -136,7 +124,7 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
mMutableMetadata.resetTemporalAttributes(); mMutableMetadata.resetTemporalAttributes();
mState = State.IDLE; mState = State.IDLE;
broadcast( Attribute.CHANNEL_STATE ); mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
} }
@Override @Override
@@ -145,6 +133,7 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
if(mStateMonitorFuture == null && mStateMonitor != null) if(mStateMonitorFuture == null && mStateMonitor != null)
{ {
mMutableMetadata.resetAllAttributes(); mMutableMetadata.resetAllAttributes();
mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
if(mTrafficChannelEndListener != null) if(mTrafficChannelEndListener != null)
{ {
@@ -193,7 +182,6 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
public void dispose() public void dispose()
{ {
mCallEventListener = null; mCallEventListener = null;
mChangedAttributeListener = null;
mDecoderStateListener = null; mDecoderStateListener = null;
mSquelchStateListener = null; mSquelchStateListener = null;
mStateMonitor = null; mStateMonitor = null;
@@ -334,7 +322,6 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
broadcast(SquelchState.SQUELCH); broadcast(SquelchState.SQUELCH);
updateFadeTimeout(); updateFadeTimeout();
mState = state; mState = state;
broadcast( Attribute.CHANNEL_STATE );
} }
break; break;
case DATA: case DATA:
@@ -342,13 +329,11 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
broadcast(SquelchState.SQUELCH); broadcast(SquelchState.SQUELCH);
updateFadeTimeout(); updateFadeTimeout();
mState = state; mState = state;
broadcast( Attribute.CHANNEL_STATE );
break; break;
case CALL: case CALL:
broadcast(SquelchState.UNSQUELCH); broadcast(SquelchState.UNSQUELCH);
updateFadeTimeout(); updateFadeTimeout();
mState = state; mState = state;
broadcast( Attribute.CHANNEL_STATE );
break; break;
case FADE: case FADE:
processFadeState(); processFadeState();
@@ -365,6 +350,8 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
default: default:
break; break;
} }
mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
} }
else else
{ {
@@ -382,7 +369,7 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
mState = State.FADE; mState = State.FADE;
broadcast(SquelchState.SQUELCH); broadcast(SquelchState.SQUELCH);
broadcast( Attribute.CHANNEL_STATE ); mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
} }
private void processIdleState() private void processIdleState()
@@ -392,23 +379,22 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
if(mState == State.FADE) if(mState == State.FADE)
{ {
broadcast(new DecoderStateEvent(this, Event.RESET, State.IDLE)); broadcast(new DecoderStateEvent(this, Event.RESET, State.IDLE));
broadcast( new MetadataReset() ); getMutableMetadata().resetTemporalAttributes();
} }
mState = State.IDLE; mState = State.IDLE;
getMutableMetadata().receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
broadcast( Attribute.CHANNEL_STATE );
} }
private void processTeardownState() private void processTeardownState()
{ {
broadcast(SquelchState.SQUELCH); broadcast(SquelchState.SQUELCH);
broadcast( new MetadataReset() ); getMutableMetadata().resetTemporalAttributes();
mState = State.TEARDOWN; mState = State.TEARDOWN;
broadcast( Attribute.CHANNEL_STATE ); mMutableMetadata.receive(new AttributeChangeRequest<State>(Attribute.CHANNEL_STATE, mState));
if(mTrafficChannelEndListener != null) if(mTrafficChannelEndListener != null)
{ {
@@ -440,7 +426,6 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
} }
//NEW: //NEW:
@Override @Override
public Listener<AttributeChangeRequest> getAttributeChangeRequestListener() public Listener<AttributeChangeRequest> getAttributeChangeRequestListener()
@@ -448,36 +433,6 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
return mMutableMetadata; return mMutableMetadata;
} }
/**
* Broadcasts the channel state attribute change event to all registered
* listeners
*/
protected void broadcast( Attribute attribute )
{
if( mChangedAttributeListener != null )
{
mChangedAttributeListener.receive( attribute );
}
}
/**
* Adds the listener to receive channel state attribute change events
*/
@Override
public void setChangedAttributeListener( Listener<Attribute> listener )
{
mChangedAttributeListener = listener;
}
/**
* Removes the listener to receive channel state attribute change events
*/
@Override
public void removeChangedAttributeListener()
{
mChangedAttributeListener = null;
}
/** /**
* Broadcasts a channel state event to any registered listeners * Broadcasts a channel state event to any registered listeners
*/ */
@@ -513,35 +468,6 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
return mDecoderStateEventReceiver; return mDecoderStateEventReceiver;
} }
/**
* Broadcasts metadata to the registered listener
*/
protected void broadcast( Metadata metadata )
{
if( mMetadataListener != null )
{
mMetadataListener.receive( metadata );
}
}
/**
* Adds a metadata listener
*/
@Override
public void setMetadataListener( Listener<Metadata> listener )
{
mMetadataListener = listener;
}
/**
* Removes the decoder state event listener
*/
@Override
public void removeMetadataListener()
{
mMetadataListener = null;
}
/** /**
* Registers a listener to be notified when a traffic channel call event is * Registers a listener to be notified when a traffic channel call event is
* completed, so that the listener can perform call tear-down * completed, so that the listener can perform call tear-down
@@ -557,40 +483,33 @@ public class ChannelState extends Module implements ICallEventProvider, IChanged
if(channel != null) if(channel != null)
{ {
broadcast( new Metadata( MetadataType.CHANNEL_NUMBER, channel, true ) ); mMutableMetadata.receive(new AttributeChangeRequest<String>(Attribute.CHANNEL_FREQUENCY_LABEL, channel));
} }
broadcast( new Metadata( MetadataType.PROTOCOL, mMutableMetadata.receive(new AttributeChangeRequest<DecoderType>(Attribute.PRIMARY_DECODER_TYPE,
mTrafficChannelCallEvent.getDecoderType().getDisplayString(), true ) ); mTrafficChannelCallEvent.getDecoderType()));
String details = mTrafficChannelCallEvent.getDetails(); String details = mTrafficChannelCallEvent.getDetails();
if( details != null )
{
broadcast( new Metadata( MetadataType.DETAILS, details, true ) );
}
String from = mTrafficChannelCallEvent.getFromID(); String from = mTrafficChannelCallEvent.getFromID();
if(from != null) if(from != null)
{ {
broadcast( new Metadata( mTrafficChannelCallEvent.getFromIDType(), mMutableMetadata.receive(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, from));
from, mTrafficChannelCallEvent.getFromIDAlias(), true ) );
} }
String to = mTrafficChannelCallEvent.getToID(); String to = mTrafficChannelCallEvent.getToID();
if(to != null) if(to != null)
{ {
broadcast( new Metadata( mTrafficChannelCallEvent.getToIDType(), to, mMutableMetadata.receive(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, to));
mTrafficChannelCallEvent.getToIDAlias(), true ) );
} }
long frequency = mTrafficChannelCallEvent.getFrequency(); long frequency = mTrafficChannelCallEvent.getFrequency();
if(frequency > 0) if(frequency > 0)
{ {
broadcast( new Metadata( MetadataType.FREQUENCY, String.valueOf( frequency ), true ) ); mMutableMetadata.receive(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY, frequency));
} }
/* Rebroadcast the allocation event so that the internal decoder states /* Rebroadcast the allocation event so that the internal decoder states

View File

@@ -1,163 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package channel.state;
import alias.Alias;
import channel.metadata.Attribute;
import icon.IconManager;
import sample.Listener;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingChangeListener;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public abstract class DecoderPanel extends JPanel
implements Listener<Attribute>, SettingChangeListener
{
private static final long serialVersionUID = 1L;
protected Font mFontDetails = new Font(Font.MONOSPACED, Font.PLAIN, 12);
protected Font mFontDecoder = new Font(Font.MONOSPACED, Font.PLAIN, 12);
protected Font mFontAuxDecoder = new Font(Font.MONOSPACED, Font.PLAIN, 10);
public static final int ICON_SIZE = 12;
protected Color mColorLabelDetails;
protected Color mColorLabelDecoder;
protected Color mColorLabelAuxDecoder;
protected IconManager mIconManager;
protected SettingsManager mSettingsManager;
protected DecoderState mDecoderState;
public DecoderPanel(IconManager iconManager, SettingsManager settingsManager, DecoderState decoderState)
{
mIconManager = iconManager;
mSettingsManager = settingsManager;
mSettingsManager.addListener(this);
mDecoderState = decoderState;
mDecoderState.setChangedAttributeListener(this);
}
public void dispose()
{
mSettingsManager.removeListener(this);
mSettingsManager = null;
mDecoderState.removeChangedAttributeListener();
mDecoderState = null;
}
public DecoderState getDecoderState()
{
return mDecoderState;
}
protected void init()
{
getColors();
setOpaque(false); //Use the parent panel's background color
}
private void getColors()
{
mColorLabelDetails = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_LABEL_DETAILS).getColor();
mColorLabelDecoder = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_LABEL_DECODER).getColor();
mColorLabelAuxDecoder = mSettingsManager.getColorSetting(
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER).getColor();
}
@Override
public void settingChanged(Setting setting)
{
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_AUX_DECODER:
mColorLabelAuxDecoder = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_LABEL_DECODER:
mColorLabelDecoder = colorSetting.getColor();
repaint();
break;
case CHANNEL_STATE_LABEL_DETAILS:
mColorLabelDetails = colorSetting.getColor();
repaint();
break;
default:
break;
}
}
}
@Override
public void settingDeleted(Setting setting)
{
}
protected void setAliasLabel(final JLabel label, final Alias alias)
{
setAliasLabel(label, alias, true);
}
protected void setAliasLabel(final JLabel label, final Alias alias, boolean includeIcon)
{
if(alias != null)
{
label.setText(alias.getName());
if(includeIcon)
{
String iconName = alias.getIconName();
if(iconName != null)
{
label.setIcon(mIconManager.getIcon(iconName, IconManager.DEFAULT_ICON_SIZE));
}
else
{
label.setIcon(null);
}
}
else
{
label.setIcon(null);
}
}
else
{
label.setText("");
label.setIcon(null);
}
}
}

View File

@@ -1,9 +1,6 @@
package channel.state; package channel.state;
import alias.AliasList; import alias.AliasList;
import audio.metadata.IMetadataProvider;
import audio.metadata.Metadata;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest; import channel.metadata.AttributeChangeRequest;
import channel.metadata.IAttributeChangeRequestProvider; import channel.metadata.IAttributeChangeRequestProvider;
import message.IMessageListener; import message.IMessageListener;
@@ -193,4 +190,5 @@ public abstract class DecoderState extends Module implements ActivitySummaryProv
{ {
mAttributeChangeRequestListener = null; mAttributeChangeRequestListener = null;
} }
} }

View File

@@ -1,10 +0,0 @@
package channel.state;
import channel.metadata.Attribute;
import sample.Listener;
public interface IChangedAttributeProvider
{
public void setChangedAttributeListener( Listener<Attribute> listener );
public void removeChangedAttributeListener();
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,45 +14,33 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package controller; package controller;
import java.awt.Color; import alias.AliasController;
import java.awt.Component; import alias.AliasModel;
import java.awt.Dimension; import audio.AudioManager;
import audio.AudioPanel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import audio.broadcast.BroadcastModel; import audio.broadcast.BroadcastModel;
import audio.broadcast.BroadcastPanel; import audio.broadcast.BroadcastPanel;
import channel.metadata.ChannelMetadataViewer;
import com.jidesoft.swing.JideTabbedPane;
import controller.channel.ChannelController;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.map.ChannelMapModel;
import icon.IconManager; import icon.IconManager;
import map.MapPanel; import map.MapPanel;
import map.MapService; import map.MapService;
import module.decode.event.CallEventPanel;
import module.decode.event.MessageActivityPanel;
import channel.state.ChannelList;
import net.miginfocom.swing.MigLayout; import net.miginfocom.swing.MigLayout;
import settings.SettingsManager; import settings.SettingsManager;
import source.SourceManager; import source.SourceManager;
import source.tuner.TunerModel; import source.tuner.TunerModel;
import source.tuner.TunerViewPanel; import source.tuner.TunerViewPanel;
import spectrum.ChannelSpectrumPanel;
import alias.AliasController;
import alias.AliasModel;
import audio.AudioManager;
import audio.AudioPanel;
import com.jidesoft.swing.JideSplitPane; import javax.swing.*;
import com.jidesoft.swing.JideTabbedPane; import java.awt.*;
import controller.channel.ChannelController;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.map.ChannelMapModel;
public class ControllerPanel extends JPanel public class ControllerPanel extends JPanel
{ {
@@ -61,13 +49,10 @@ public class ControllerPanel extends JPanel
private AliasController mAliasController; private AliasController mAliasController;
private AudioPanel mAudioPanel; private AudioPanel mAudioPanel;
private BroadcastPanel mBroadcastPanel; private BroadcastPanel mBroadcastPanel;
private CallEventPanel mCallEventPanel;
private ChannelController mChannelController; private ChannelController mChannelController;
private ChannelList mChannelStateList; private ChannelMetadataViewer mChannelMetadataViewer;
private ChannelModel mChannelModel; private ChannelModel mChannelModel;
private ChannelSpectrumPanel mChannelSpectrumPanel;
private MapPanel mMapPanel; private MapPanel mMapPanel;
private MessageActivityPanel mMessageActivityPanel;
private TunerViewPanel mTunerManagerPanel; private TunerViewPanel mTunerManagerPanel;
private JideTabbedPane mTabbedPane; private JideTabbedPane mTabbedPane;
@@ -89,24 +74,16 @@ public class ControllerPanel extends JPanel
mAudioPanel = new AudioPanel(iconManager, settingsManager, sourceManager, audioManager); mAudioPanel = new AudioPanel(iconManager, settingsManager, sourceManager, audioManager);
mMapPanel = new MapPanel(mapService, iconManager, settingsManager); mChannelMetadataViewer = new ChannelMetadataViewer(channelProcessingManager, iconManager, settingsManager);
mMessageActivityPanel = new MessageActivityPanel(channelProcessingManager); mMapPanel = new MapPanel(mapService, iconManager, settingsManager);
mBroadcastPanel = new BroadcastPanel(broadcastModel, aliasModel, iconManager); mBroadcastPanel = new BroadcastPanel(broadcastModel, aliasModel, iconManager);
mCallEventPanel = new CallEventPanel(iconManager, channelProcessingManager); mChannelController = new ChannelController(channelModel, channelMapModel, sourceManager, aliasModel);
mChannelSpectrumPanel = new ChannelSpectrumPanel(settingsManager,
channelProcessingManager);
mChannelStateList = new ChannelList(channelModel, channelProcessingManager, iconManager,
settingsManager, mAudioPanel);
mChannelController = new ChannelController(channelModel, channelMapModel,
sourceManager, aliasModel);
mAliasController = new AliasController(aliasModel, broadcastModel, iconManager); mAliasController = new AliasController(aliasModel, broadcastModel, iconManager);
mTunerManagerPanel = new TunerViewPanel(tunerModel); mTunerManagerPanel = new TunerViewPanel(tunerModel);
init(); init();
@@ -114,66 +91,24 @@ public class ControllerPanel extends JPanel
private void init() private void init()
{ {
setLayout(new MigLayout("insets 0 0 0 0 ", setLayout(new MigLayout("insets 0 0 0 0 ", "[grow,fill]", "[]0[grow,fill]"));
"[grow,fill]",
"[grow,fill]")); add(mAudioPanel);
//Tabbed View - configuration, calls, messages, map //Tabbed View - configuration, calls, messages, map
mTabbedPane = new JideTabbedPane(); mTabbedPane = new JideTabbedPane();
mTabbedPane.setFont(this.getFont()); mTabbedPane.setFont(this.getFont());
mTabbedPane.setForeground(Color.BLACK); mTabbedPane.setForeground(Color.BLACK);
mTabbedPane.addTab("Tuners", mTunerManagerPanel); mTabbedPane.addTab("Now Playing", mChannelMetadataViewer);
mTabbedPane.addTab("Channels", mChannelController);
mTabbedPane.addTab("Aliases", mAliasController); mTabbedPane.addTab("Aliases", mAliasController);
mTabbedPane.addTab("Channel Spectrum", mChannelSpectrumPanel); mTabbedPane.addTab("Channels", mChannelController);
mTabbedPane.addTab("Events", mCallEventPanel);
mTabbedPane.addTab("Map", mMapPanel); mTabbedPane.addTab("Map", mMapPanel);
mTabbedPane.addTab("Messages", mMessageActivityPanel);
mTabbedPane.addTab("Streaming", mBroadcastPanel); mTabbedPane.addTab("Streaming", mBroadcastPanel);
mTabbedPane.addTab("Tuners", mTunerManagerPanel);
/**
* Change listener to enable/disable the channel spectrum display
* only when the tab is visible, and a channel has been selected
*/
mTabbedPane.addChangeListener(new ChangeListener()
{
@Override
public void stateChanged(ChangeEvent event)
{
int index = mTabbedPane.getSelectedIndex();
Component component = mTabbedPane.getComponentAt(index);
if (component instanceof ChannelSpectrumPanel)
{
mChannelSpectrumPanel.setEnabled(true);
}
else
{
mChannelSpectrumPanel.setEnabled(false);
}
}
});
/* Register each of the components to receive channel events when the
* channels are selected or change */
mChannelModel.addListener(mCallEventPanel);
mChannelModel.addListener(mChannelStateList);
mChannelModel.addListener(mChannelSpectrumPanel);
mChannelModel.addListener(mMessageActivityPanel);
JScrollPane channelStateListScroll = new JScrollPane();
channelStateListScroll.getViewport().setView(mChannelStateList);
channelStateListScroll.setPreferredSize(new Dimension(400, 500));
//Set preferred size to influence the split between these panels //Set preferred size to influence the split between these panels
mTabbedPane.setPreferredSize(new Dimension(880, 500)); mTabbedPane.setPreferredSize(new Dimension(880, 500));
JideSplitPane channelSplit = new JideSplitPane(JideSplitPane.HORIZONTAL_SPLIT); add(mTabbedPane);
channelSplit.setDividerSize(5);
channelSplit.add(channelStateListScroll);
channelSplit.add(mTabbedPane);
add(channelSplit);
} }
} }

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,38 +14,38 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package controller.channel; package controller.channel;
import java.util.HashMap; import alias.AliasModel;
import java.util.List; import audio.AudioPacket;
import java.util.Map; import channel.metadata.Attribute;
import java.util.concurrent.CopyOnWriteArrayList; import channel.metadata.AttributeChangeRequest;
import channel.metadata.ChannelMetadataModel;
import controller.channel.Channel.ChannelType;
import controller.channel.ChannelEvent.Event;
import controller.channel.map.ChannelMapModel;
import filter.FilterSet;
import message.Message; import message.Message;
import module.Module; import module.Module;
import module.ProcessingChain; import module.ProcessingChain;
import module.decode.DecoderFactory; import module.decode.DecoderFactory;
import module.decode.event.MessageActivityModel; import module.decode.event.MessageActivityModel;
import module.log.EventLogManager; import module.log.EventLogManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import record.RecorderManager; import record.RecorderManager;
import record.RecorderType; import record.RecorderType;
import sample.Listener; import sample.Listener;
import source.Source; import source.Source;
import source.SourceException; import source.SourceException;
import source.SourceManager; import source.SourceManager;
import alias.AliasModel;
import audio.AudioPacket; import java.util.HashMap;
import audio.metadata.Metadata; import java.util.List;
import audio.metadata.MetadataType; import java.util.Map;
import controller.channel.Channel.ChannelType; import java.util.concurrent.CopyOnWriteArrayList;
import controller.channel.ChannelEvent.Event;
import controller.channel.map.ChannelMapModel;
import filter.FilterSet;
public class ChannelProcessingManager implements ChannelEventListener public class ChannelProcessingManager implements ChannelEventListener
{ {
@@ -58,6 +58,7 @@ public class ChannelProcessingManager implements ChannelEventListener
private ChannelModel mChannelModel; private ChannelModel mChannelModel;
private ChannelMapModel mChannelMapModel; private ChannelMapModel mChannelMapModel;
private ChannelMetadataModel mChannelMetadataModel = new ChannelMetadataModel();
private AliasModel mAliasModel; private AliasModel mAliasModel;
private EventLogManager mEventLogManager; private EventLogManager mEventLogManager;
private RecorderManager mRecorderManager; private RecorderManager mRecorderManager;
@@ -78,6 +79,14 @@ public class ChannelProcessingManager implements ChannelEventListener
mSourceManager = sourceManager; mSourceManager = sourceManager;
} }
/**
* Channel metadata model containing metadata for each channel or channel time-slice that is currently processing.
*/
public ChannelMetadataModel getChannelMetadataModel()
{
return mChannelMetadataModel;
}
/** /**
* Indicates if a processing chain is constructed for the channel and that * Indicates if a processing chain is constructed for the channel and that
* the processing chain is currently processing. * the processing chain is currently processing.
@@ -198,8 +207,8 @@ public class ChannelProcessingManager implements ChannelEventListener
} }
/* Processing Modules */ /* Processing Modules */
List<Module> modules = DecoderFactory.getModules(mChannelModel, List<Module> modules = DecoderFactory.getModules(mChannelModel, mChannelMapModel, this,
mChannelMapModel, this, mAliasModel, channel); mAliasModel, channel, processingChain.getChannelState().getMutableMetadata());
processingChain.addModules(modules); processingChain.addModules(modules);
/* Setup message activity model with filtering */ /* Setup message activity model with filtering */
@@ -207,14 +216,39 @@ public class ChannelProcessingManager implements ChannelEventListener
MessageActivityModel messageModel = new MessageActivityModel(messageFilter); MessageActivityModel messageModel = new MessageActivityModel(messageFilter);
processingChain.setMessageActivityModel(messageModel); processingChain.setMessageActivityModel(messageModel);
/* Inject channel metadata that will be inserted into audio packets //Override recordable flag in metadata if user has specified audio recording
* for the recorder manager and streaming */ if(channel.getRecordConfiguration() != null &&
processingChain.broadcast( channel.getRecordConfiguration().getRecorders().contains(RecorderType.AUDIO))
new Metadata(MetadataType.SYSTEM, channel.getSystem())); {
processingChain.broadcast( processingChain.getChannelState().getMutableMetadata().setRecordable(true);
new Metadata(MetadataType.SITE_ID, channel.getSite())); }
processingChain.broadcast(
new Metadata(MetadataType.CHANNEL_NAME, channel.getName())); //Inject channel metadata that will be inserted into audio packets for recorder manager and streaming
StringBuilder sb = new StringBuilder();
if(channel.getSystem() != null)
{
sb.append(channel.getSystem());
}
if(channel.getSite() != null)
{
if(sb.length() > 0)
{
sb.append(" - ");
}
sb.append(channel.getSite());
}
if(sb.length() > 0)
{
processingChain.getChannelState().getMutableMetadata()
.receive(new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_1, sb.toString()));
}
processingChain.getChannelState().getMutableMetadata()
.receive(new AttributeChangeRequest<String>(Attribute.CHANNEL_CONFIGURATION_LABEL_2, channel.getName()));
} }
/* Setup event logging */ /* Setup event logging */

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,15 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package instrument.gui; package instrument.gui;
import alias.AliasModel;
import controller.channel.Channel;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.map.ChannelMapModel;
import instrument.Instrumentable; import instrument.Instrumentable;
import instrument.InstrumentableProcessingChain; import instrument.InstrumentableProcessingChain;
import instrument.tap.Tap; import instrument.tap.Tap;
@@ -38,8 +44,21 @@ import instrument.tap.stream.QPSKTap;
import instrument.tap.stream.QPSKTapPanel; import instrument.tap.stream.QPSKTapPanel;
import instrument.tap.stream.SymbolEventTap; import instrument.tap.stream.SymbolEventTap;
import instrument.tap.stream.SymbolEventTapViewPanel; import instrument.tap.stream.SymbolEventTapViewPanel;
import message.Message;
import module.Module;
import module.decode.DecoderFactory;
import module.decode.config.DecodeConfiguration;
import module.log.EventLogManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import playlist.PlaylistManager;
import sample.Listener;
import source.IControllableFileSource;
import source.Source;
import java.awt.Dimension; import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
@@ -47,50 +66,18 @@ import java.awt.event.MouseListener;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import javax.swing.JCheckBoxMenuItem; public class DecoderViewFrame extends JInternalFrame implements Listener<Message>
import javax.swing.JInternalFrame;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import message.Message;
import module.Module;
import module.decode.DecoderFactory;
import module.decode.config.DecodeConfiguration;
import module.log.EventLogManager;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import playlist.PlaylistManager;
import sample.Listener;
import source.IControllableFileSource;
import source.Source;
import alias.AliasModel;
import controller.channel.Channel;
import controller.channel.ChannelModel;
import controller.channel.ChannelProcessingManager;
import controller.channel.map.ChannelMapModel;
public class DecoderViewFrame extends JInternalFrame
implements Listener<Message>
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger mLog = private final static Logger mLog = LoggerFactory.getLogger(DecoderViewFrame.class);
LoggerFactory.getLogger( DecoderViewFrame.class );
private DecodeConfiguration mDecodeConfig; private DecodeConfiguration mDecodeConfig;
private InstrumentableProcessingChain mProcessingChain; private InstrumentableProcessingChain mProcessingChain;
private IControllableFileSource mSource; private IControllableFileSource mSource;
private HashMap<Tap,TapViewPanel> mPanelMap = private HashMap<Tap,TapViewPanel> mPanelMap = new HashMap<Tap,TapViewPanel>();
new HashMap<Tap,TapViewPanel>();
public DecoderViewFrame( PlaylistManager playlistManager, public DecoderViewFrame(PlaylistManager playlistManager, Channel channel, IControllableFileSource source)
Channel channel,
IControllableFileSource source )
{ {
mSource = source; mSource = source;
@@ -101,12 +88,11 @@ public class DecoderViewFrame extends JInternalFrame
ChannelModel channelModel = new ChannelModel(); ChannelModel channelModel = new ChannelModel();
ChannelMapModel channelMapModel = new ChannelMapModel(); ChannelMapModel channelMapModel = new ChannelMapModel();
ChannelProcessingManager channelProcessingManager = ChannelProcessingManager channelProcessingManager = new ChannelProcessingManager(channelModel, channelMapModel,
new ChannelProcessingManager( channelModel, channelMapModel,
new AliasModel(), new EventLogManager(), null, null); new AliasModel(), new EventLogManager(), null, null);
List<Module> modules = DecoderFactory.getModules( channelModel, List<Module> modules = DecoderFactory.getModules(channelModel, channelMapModel, channelProcessingManager,
channelMapModel, channelProcessingManager, new AliasModel(), channel ); new AliasModel(), channel, mProcessingChain.getChannelState().getMutableMetadata());
mProcessingChain.addModules(modules); mProcessingChain.addModules(modules);
@@ -158,13 +144,24 @@ public class DecoderViewFrame extends JInternalFrame
} }
@Override @Override
public void mouseEntered( MouseEvent arg0 ) {} public void mouseEntered(MouseEvent arg0)
{
}
@Override @Override
public void mouseExited( MouseEvent arg0 ) {} public void mouseExited(MouseEvent arg0)
{
}
@Override @Override
public void mousePressed( MouseEvent arg0 ) {} public void mousePressed(MouseEvent arg0)
{
}
@Override @Override
public void mouseReleased( MouseEvent arg0 ) {} public void mouseReleased(MouseEvent arg0)
{
}
}); });
} }

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2015-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,18 +14,23 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module; package module;
import audio.AudioPacket; import audio.AudioPacket;
import audio.IAudioPacketListener; import audio.IAudioPacketListener;
import audio.IAudioPacketProvider; import audio.IAudioPacketProvider;
import audio.metadata.IMetadataListener;
import audio.metadata.IMetadataProvider;
import audio.metadata.Metadata;
import audio.squelch.ISquelchStateListener; import audio.squelch.ISquelchStateListener;
import audio.squelch.ISquelchStateProvider; import audio.squelch.ISquelchStateProvider;
import audio.squelch.SquelchState; import audio.squelch.SquelchState;
import channel.state.ChannelState;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.IDecoderStateEventListener;
import channel.state.IDecoderStateEventProvider;
import channel.state.State;
import controller.NamingThreadFactory; import controller.NamingThreadFactory;
import controller.channel.Channel.ChannelType; import controller.channel.Channel.ChannelType;
import controller.channel.ChannelEvent; import controller.channel.ChannelEvent;
@@ -39,13 +44,6 @@ import module.decode.event.CallEventModel;
import module.decode.event.ICallEventListener; import module.decode.event.ICallEventListener;
import module.decode.event.ICallEventProvider; import module.decode.event.ICallEventProvider;
import module.decode.event.MessageActivityModel; import module.decode.event.MessageActivityModel;
import channel.state.ChannelState;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.IDecoderStateEventListener;
import channel.state.IDecoderStateEventProvider;
import channel.state.State;
import module.log.EventLogger; import module.log.EventLogger;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -98,7 +96,6 @@ public class ProcessingChain implements IChannelEventListener
private final static Logger mLog = LoggerFactory.getLogger(ProcessingChain.class); private final static Logger mLog = LoggerFactory.getLogger(ProcessingChain.class);
private Broadcaster<AudioPacket> mAudioPacketBroadcaster = new Broadcaster<>(); private Broadcaster<AudioPacket> mAudioPacketBroadcaster = new Broadcaster<>();
private Broadcaster<Metadata> mMetadataBroadcaster = new Broadcaster<>();
private Broadcaster<CallEvent> mCallEventBroadcaster = new Broadcaster<>(); private Broadcaster<CallEvent> mCallEventBroadcaster = new Broadcaster<>();
private Broadcaster<ChannelEvent> mChannelEventBroadcaster = new Broadcaster<>(); private Broadcaster<ChannelEvent> mChannelEventBroadcaster = new Broadcaster<>();
private Broadcaster<ComplexBuffer> mComplexBufferBroadcaster = new Broadcaster<>(); private Broadcaster<ComplexBuffer> mComplexBufferBroadcaster = new Broadcaster<>();
@@ -186,17 +183,6 @@ public class ProcessingChain implements IChannelEventListener
} }
} }
/**
* Broadcasts the metadata to any registered listeners
*/
public void broadcast(Metadata metadata)
{
if(mMetadataBroadcaster != null)
{
mMetadataBroadcaster.broadcast(metadata);
}
}
/** /**
* Indicates if this processing chain is currently receiving samples from * Indicates if this processing chain is currently receiving samples from
* a source and sending those samples to the decoders. * a source and sending those samples to the decoders.
@@ -227,9 +213,8 @@ public class ProcessingChain implements IChannelEventListener
{ {
if(isProcessing()) if(isProcessing())
{ {
throw new IllegalStateException("Processing chain is currently " throw new IllegalStateException("Processing chain is currently processing. Invoke stop() on the " +
+ "processing. Invoke stop() on the processing chain before " "processing chain before applying a new sample source");
+ "applying a new sample source");
} }
mSource = source; mSource = source;
@@ -314,68 +299,52 @@ public class ProcessingChain implements IChannelEventListener
{ {
if(module instanceof IAudioPacketListener) if(module instanceof IAudioPacketListener)
{ {
mAudioPacketBroadcaster.addListener( mAudioPacketBroadcaster.addListener(((IAudioPacketListener) module).getAudioPacketListener());
((IAudioPacketListener) module).getAudioPacketListener());
} }
if(module instanceof ICallEventListener) if(module instanceof ICallEventListener)
{ {
mCallEventBroadcaster.addListener( mCallEventBroadcaster.addListener(((ICallEventListener) module).getCallEventListener());
((ICallEventListener) module).getCallEventListener());
} }
if(module instanceof IChannelEventListener) if(module instanceof IChannelEventListener)
{ {
mChannelEventBroadcaster.addListener( mChannelEventBroadcaster.addListener(((IChannelEventListener) module).getChannelEventListener());
((IChannelEventListener) module).getChannelEventListener());
} }
if(module instanceof IComplexBufferListener) if(module instanceof IComplexBufferListener)
{ {
mComplexBufferBroadcaster.addListener( mComplexBufferBroadcaster.addListener(((IComplexBufferListener) module).getComplexBufferListener());
((IComplexBufferListener) module).getComplexBufferListener());
} }
if(module instanceof IDecoderStateEventListener) if(module instanceof IDecoderStateEventListener)
{ {
mDecoderStateEventBroadcaster.addListener( mDecoderStateEventBroadcaster.addListener(((IDecoderStateEventListener) module).getDecoderStateListener());
((IDecoderStateEventListener) module).getDecoderStateListener());
} }
if(module instanceof IFrequencyChangeListener) if(module instanceof IFrequencyChangeListener)
{ {
mFrequencyChangeEventBroadcaster.addListener( mFrequencyChangeEventBroadcaster.addListener(((IFrequencyChangeListener) module).getFrequencyChangeListener());
((IFrequencyChangeListener) module).getFrequencyChangeListener());
} }
if(module instanceof IMessageListener) if(module instanceof IMessageListener)
{ {
mMessageBroadcaster.addListener( mMessageBroadcaster.addListener(((IMessageListener) module).getMessageListener());
((IMessageListener) module).getMessageListener());
}
if(module instanceof IMetadataListener)
{
mMetadataBroadcaster.addListener(
((IMetadataListener) module).getMetadataListener());
} }
if(module instanceof IFilteredRealBufferListener) if(module instanceof IFilteredRealBufferListener)
{ {
mFilteredRealBufferBroadcaster.addListener( mFilteredRealBufferBroadcaster.addListener(((IFilteredRealBufferListener) module).getFilteredRealBufferListener());
((IFilteredRealBufferListener) module).getFilteredRealBufferListener());
} }
if(module instanceof ISquelchStateListener) if(module instanceof ISquelchStateListener)
{ {
mSquelchStateBroadcaster.addListener( mSquelchStateBroadcaster.addListener(((ISquelchStateListener) module).getSquelchStateListener());
((ISquelchStateListener) module).getSquelchStateListener());
} }
if(module instanceof IUnFilteredRealBufferListener) if(module instanceof IUnFilteredRealBufferListener)
{ {
mUnFilteredRealBufferBroadcaster.addListener( mUnFilteredRealBufferBroadcaster.addListener(((IUnFilteredRealBufferListener) module).getUnFilteredRealBufferListener());
((IUnFilteredRealBufferListener) module).getUnFilteredRealBufferListener());
} }
} }
@@ -387,38 +356,32 @@ public class ProcessingChain implements IChannelEventListener
{ {
if(module instanceof IAudioPacketListener) if(module instanceof IAudioPacketListener)
{ {
mAudioPacketBroadcaster.removeListener( mAudioPacketBroadcaster.removeListener(((IAudioPacketListener) module).getAudioPacketListener());
((IAudioPacketListener) module).getAudioPacketListener());
} }
if(module instanceof ICallEventListener) if(module instanceof ICallEventListener)
{ {
mCallEventBroadcaster.removeListener( mCallEventBroadcaster.removeListener(((ICallEventListener) module).getCallEventListener());
((ICallEventListener) module).getCallEventListener());
} }
if(module instanceof IChannelEventListener) if(module instanceof IChannelEventListener)
{ {
mChannelEventBroadcaster.removeListener( mChannelEventBroadcaster.removeListener(((IChannelEventListener) module).getChannelEventListener());
((IChannelEventListener) module).getChannelEventListener());
} }
if(module instanceof IComplexBufferListener) if(module instanceof IComplexBufferListener)
{ {
mComplexBufferBroadcaster.removeListener( mComplexBufferBroadcaster.removeListener(((IComplexBufferListener) module).getComplexBufferListener());
((IComplexBufferListener) module).getComplexBufferListener());
} }
if(module instanceof IDecoderStateEventListener) if(module instanceof IDecoderStateEventListener)
{ {
mDecoderStateEventBroadcaster.removeListener( mDecoderStateEventBroadcaster.removeListener(((IDecoderStateEventListener) module).getDecoderStateListener());
((IDecoderStateEventListener) module).getDecoderStateListener());
} }
if(module instanceof IFrequencyChangeListener) if(module instanceof IFrequencyChangeListener)
{ {
mFrequencyChangeEventBroadcaster.removeListener( mFrequencyChangeEventBroadcaster.removeListener(((IFrequencyChangeListener) module).getFrequencyChangeListener());
((IFrequencyChangeListener) module).getFrequencyChangeListener());
} }
if(module instanceof IMessageListener) if(module instanceof IMessageListener)
@@ -426,27 +389,19 @@ public class ProcessingChain implements IChannelEventListener
mMessageBroadcaster.removeListener(((IMessageListener) module).getMessageListener()); mMessageBroadcaster.removeListener(((IMessageListener) module).getMessageListener());
} }
if(module instanceof IMetadataListener)
{
mMetadataBroadcaster.removeListener(((IMetadataListener) module).getMetadataListener());
}
if(module instanceof IFilteredRealBufferListener) if(module instanceof IFilteredRealBufferListener)
{ {
mFilteredRealBufferBroadcaster.removeListener( mFilteredRealBufferBroadcaster.removeListener(((IFilteredRealBufferListener) module).getFilteredRealBufferListener());
((IFilteredRealBufferListener) module).getFilteredRealBufferListener());
} }
if(module instanceof ISquelchStateListener) if(module instanceof ISquelchStateListener)
{ {
mSquelchStateBroadcaster.removeListener( mSquelchStateBroadcaster.removeListener(((ISquelchStateListener) module).getSquelchStateListener());
((ISquelchStateListener) module).getSquelchStateListener());
} }
if(module instanceof IUnFilteredRealBufferListener) if(module instanceof IUnFilteredRealBufferListener)
{ {
mUnFilteredRealBufferBroadcaster.removeListener( mUnFilteredRealBufferBroadcaster.removeListener(((IUnFilteredRealBufferListener) module).getUnFilteredRealBufferListener());
((IUnFilteredRealBufferListener) module).getUnFilteredRealBufferListener());
} }
} }
@@ -458,8 +413,7 @@ public class ProcessingChain implements IChannelEventListener
{ {
if(module instanceof IAudioPacketProvider) if(module instanceof IAudioPacketProvider)
{ {
((IAudioPacketProvider) module).setAudioPacketListener( ((IAudioPacketProvider) module).setAudioPacketListener(mAudioPacketBroadcaster);
mAudioPacketBroadcaster);
} }
if(module instanceof ICallEventProvider) if(module instanceof ICallEventProvider)
@@ -469,20 +423,17 @@ public class ProcessingChain implements IChannelEventListener
if(module instanceof IChannelEventProvider) if(module instanceof IChannelEventProvider)
{ {
((IChannelEventProvider) module).setChannelEventListener( ((IChannelEventProvider) module).setChannelEventListener(mChannelEventBroadcaster);
mChannelEventBroadcaster);
} }
if(module instanceof IDecoderStateEventProvider) if(module instanceof IDecoderStateEventProvider)
{ {
((IDecoderStateEventProvider) module).setDecoderStateListener( ((IDecoderStateEventProvider) module).setDecoderStateListener(mDecoderStateEventBroadcaster);
mDecoderStateEventBroadcaster);
} }
if(module instanceof IFrequencyChangeProvider) if(module instanceof IFrequencyChangeProvider)
{ {
((IFrequencyChangeProvider) module).setFrequencyChangeListener( ((IFrequencyChangeProvider) module).setFrequencyChangeListener(mFrequencyChangeEventBroadcaster);
mFrequencyChangeEventBroadcaster);
} }
if(module instanceof IMessageProvider) if(module instanceof IMessageProvider)
@@ -490,28 +441,19 @@ public class ProcessingChain implements IChannelEventListener
((IMessageProvider) module).setMessageListener(mMessageBroadcaster); ((IMessageProvider) module).setMessageListener(mMessageBroadcaster);
} }
if(module instanceof IMetadataProvider)
{
((IMetadataProvider) module).setMetadataListener(
mMetadataBroadcaster);
}
if(module instanceof IFilteredRealBufferProvider) if(module instanceof IFilteredRealBufferProvider)
{ {
((IFilteredRealBufferProvider) module) ((IFilteredRealBufferProvider) module).setFilteredRealBufferListener(mFilteredRealBufferBroadcaster);
.setFilteredRealBufferListener(mFilteredRealBufferBroadcaster);
} }
if(module instanceof ISquelchStateProvider) if(module instanceof ISquelchStateProvider)
{ {
((ISquelchStateProvider) module).setSquelchStateListener( ((ISquelchStateProvider) module).setSquelchStateListener(mSquelchStateBroadcaster);
mSquelchStateBroadcaster);
} }
if(module instanceof IUnFilteredRealBufferProvider) if(module instanceof IUnFilteredRealBufferProvider)
{ {
((IUnFilteredRealBufferProvider) module) ((IUnFilteredRealBufferProvider) module).setUnFilteredRealBufferListener(mUnFilteredRealBufferBroadcaster);
.setUnFilteredRealBufferListener(mUnFilteredRealBufferBroadcaster);
} }
} }
@@ -551,11 +493,6 @@ public class ProcessingChain implements IChannelEventListener
((IMessageProvider) module).setMessageListener(null); ((IMessageProvider) module).setMessageListener(null);
} }
if(module instanceof IMetadataProvider)
{
((IMetadataProvider) module).setMetadataListener(null);
}
if(module instanceof IFilteredRealBufferProvider) if(module instanceof IFilteredRealBufferProvider)
{ {
((IFilteredRealBufferProvider) module).setFilteredRealBufferListener(null); ((IFilteredRealBufferProvider) module).setFilteredRealBufferListener(null);
@@ -615,8 +552,7 @@ public class ProcessingChain implements IChannelEventListener
long frequency = tcs.getFrequency(); long frequency = tcs.getFrequency();
mDecoderStateEventBroadcaster.broadcast( mDecoderStateEventBroadcaster.broadcast(
new DecoderStateEvent(this, Event.SOURCE_FREQUENCY, new DecoderStateEvent(this, Event.SOURCE_FREQUENCY, State.IDLE, frequency));
State.IDLE, frequency));
} }
catch(SourceException e) catch(SourceException e)
{ {

View File

@@ -21,6 +21,9 @@ package module.decode;
import alias.AliasList; import alias.AliasList;
import alias.AliasModel; import alias.AliasModel;
import audio.AudioModule; import audio.AudioModule;
import channel.metadata.Metadata;
import channel.state.AlwaysUnsquelchedDecoderState;
import channel.traffic.TrafficChannelManager;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.Channel.ChannelType; import controller.channel.Channel.ChannelType;
import controller.channel.ChannelModel; import controller.channel.ChannelModel;
@@ -32,55 +35,45 @@ import filter.FilterSet;
import filter.IFilter; import filter.IFilter;
import gui.editor.EmptyValidatingEditor; import gui.editor.EmptyValidatingEditor;
import gui.editor.ValidatingEditor; import gui.editor.ValidatingEditor;
import icon.IconManager;
import message.Message; import message.Message;
import message.MessageDirection; import message.MessageDirection;
import module.Module; import module.Module;
import module.decode.am.AMDecoder; import module.decode.am.AMDecoder;
import module.decode.am.AMDecoderEditor; import module.decode.am.AMDecoderEditor;
import module.decode.am.AMDecoderPanel;
import module.decode.am.DecodeConfigAM; import module.decode.am.DecodeConfigAM;
import module.decode.config.AuxDecodeConfiguration; import module.decode.config.AuxDecodeConfiguration;
import module.decode.config.DecodeConfiguration; import module.decode.config.DecodeConfiguration;
import module.decode.fleetsync2.Fleetsync2Decoder; import module.decode.fleetsync2.Fleetsync2Decoder;
import module.decode.fleetsync2.Fleetsync2DecoderPanel;
import module.decode.fleetsync2.Fleetsync2DecoderState; import module.decode.fleetsync2.Fleetsync2DecoderState;
import module.decode.fleetsync2.FleetsyncMessageFilter; import module.decode.fleetsync2.FleetsyncMessageFilter;
import module.decode.lj1200.LJ1200Decoder; import module.decode.lj1200.LJ1200Decoder;
import module.decode.lj1200.LJ1200DecoderPanel;
import module.decode.lj1200.LJ1200DecoderState; import module.decode.lj1200.LJ1200DecoderState;
import module.decode.lj1200.LJ1200MessageFilter; import module.decode.lj1200.LJ1200MessageFilter;
import module.decode.ltrnet.DecodeConfigLTRNet; import module.decode.ltrnet.DecodeConfigLTRNet;
import module.decode.ltrnet.LTRNetDecoder; import module.decode.ltrnet.LTRNetDecoder;
import module.decode.ltrnet.LTRNetDecoderEditor; import module.decode.ltrnet.LTRNetDecoderEditor;
import module.decode.ltrnet.LTRNetDecoderPanel;
import module.decode.ltrnet.LTRNetDecoderState; import module.decode.ltrnet.LTRNetDecoderState;
import module.decode.ltrnet.LTRNetMessageFilter; import module.decode.ltrnet.LTRNetMessageFilter;
import module.decode.ltrstandard.DecodeConfigLTRStandard; import module.decode.ltrstandard.DecodeConfigLTRStandard;
import module.decode.ltrstandard.LTRStandardDecoder; import module.decode.ltrstandard.LTRStandardDecoder;
import module.decode.ltrstandard.LTRStandardDecoderEditor; import module.decode.ltrstandard.LTRStandardDecoderEditor;
import module.decode.ltrstandard.LTRStandardDecoderPanel;
import module.decode.ltrstandard.LTRStandardDecoderState; import module.decode.ltrstandard.LTRStandardDecoderState;
import module.decode.ltrstandard.LTRStandardMessageFilter; import module.decode.ltrstandard.LTRStandardMessageFilter;
import module.decode.mdc1200.MDCDecoder; import module.decode.mdc1200.MDCDecoder;
import module.decode.mdc1200.MDCDecoderPanel;
import module.decode.mdc1200.MDCDecoderState; import module.decode.mdc1200.MDCDecoderState;
import module.decode.mdc1200.MDCMessageFilter; import module.decode.mdc1200.MDCMessageFilter;
import module.decode.mpt1327.DecodeConfigMPT1327; import module.decode.mpt1327.DecodeConfigMPT1327;
import module.decode.mpt1327.MPT1327Decoder; import module.decode.mpt1327.MPT1327Decoder;
import module.decode.mpt1327.MPT1327Decoder.Sync; import module.decode.mpt1327.MPT1327Decoder.Sync;
import module.decode.mpt1327.MPT1327DecoderEditor; import module.decode.mpt1327.MPT1327DecoderEditor;
import module.decode.mpt1327.MPT1327DecoderPanel;
import module.decode.mpt1327.MPT1327DecoderState; import module.decode.mpt1327.MPT1327DecoderState;
import module.decode.mpt1327.MPT1327MessageFilter; import module.decode.mpt1327.MPT1327MessageFilter;
import module.decode.nbfm.DecodeConfigNBFM; import module.decode.nbfm.DecodeConfigNBFM;
import module.decode.nbfm.NBFMDecoder; import module.decode.nbfm.NBFMDecoder;
import module.decode.nbfm.NBFMDecoderEditor; import module.decode.nbfm.NBFMDecoderEditor;
import module.decode.nbfm.NBFMDecoderPanel;
import module.decode.p25.DecodeConfigP25Phase1; import module.decode.p25.DecodeConfigP25Phase1;
import module.decode.p25.P25Decoder.Modulation; import module.decode.p25.P25Decoder.Modulation;
import module.decode.p25.P25DecoderEditor; import module.decode.p25.P25DecoderEditor;
import module.decode.p25.P25DecoderPanel;
import module.decode.p25.P25DecoderState; import module.decode.p25.P25DecoderState;
import module.decode.p25.P25_C4FMDecoder; import module.decode.p25.P25_C4FMDecoder;
import module.decode.p25.P25_LSMDecoder; import module.decode.p25.P25_LSMDecoder;
@@ -89,26 +82,14 @@ import module.decode.p25.message.filter.P25MessageFilterSet;
import module.decode.passport.DecodeConfigPassport; import module.decode.passport.DecodeConfigPassport;
import module.decode.passport.PassportDecoder; import module.decode.passport.PassportDecoder;
import module.decode.passport.PassportDecoderEditor; import module.decode.passport.PassportDecoderEditor;
import module.decode.passport.PassportDecoderPanel;
import module.decode.passport.PassportDecoderState; import module.decode.passport.PassportDecoderState;
import module.decode.passport.PassportMessageFilter; import module.decode.passport.PassportMessageFilter;
import channel.state.AlwaysUnsquelchedDecoderState;
import channel.state.DecoderPanel;
import channel.state.DecoderState;
import channel.traffic.TrafficChannelManager;
import module.decode.tait.Tait1200Decoder; import module.decode.tait.Tait1200Decoder;
import module.decode.tait.Tait1200DecoderPanel;
import module.decode.tait.Tait1200DecoderState; import module.decode.tait.Tait1200DecoderState;
import module.demodulate.am.AMDemodulatorModule; import module.demodulate.am.AMDemodulatorModule;
import module.demodulate.audio.DemodulatedAudioFilterModule; import module.demodulate.audio.DemodulatedAudioFilterModule;
import module.demodulate.fm.FMDemodulatorModule; import module.demodulate.fm.FMDemodulatorModule;
import properties.SystemProperties;
import record.RecorderType;
import record.config.RecordConfiguration;
import settings.SettingsManager;
import util.TimeStamp;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -129,14 +110,15 @@ public class DecoderFactory
ChannelMapModel channelMapModel, ChannelMapModel channelMapModel,
ChannelProcessingManager channelProcessingManager, ChannelProcessingManager channelProcessingManager,
AliasModel aliasModel, AliasModel aliasModel,
Channel channel) Channel channel,
Metadata metadata)
{ {
/* Get the optional alias list for the decode modules to use */ /* Get the optional alias list for the decode modules to use */
AliasList aliasList = aliasModel.getAliasList(channel.getAliasListName()); AliasList aliasList = aliasModel.getAliasList(channel.getAliasListName());
List<Module> modules = getPrimaryModules(channelModel, channelMapModel, List<Module> modules = getPrimaryModules(channelModel, channelMapModel, channelProcessingManager, aliasList,
channelProcessingManager, aliasList, channel); channel, metadata);
modules.addAll(getAuxiliaryDecoders(channel.getAuxDecodeConfiguration(), aliasList)); modules.addAll(getAuxiliaryDecoders(channel.getAuxDecodeConfiguration(), aliasList));
@@ -150,7 +132,7 @@ public class DecoderFactory
ChannelMapModel channelMapModel, ChannelMapModel channelMapModel,
ChannelProcessingManager channelProcessingManager, ChannelProcessingManager channelProcessingManager,
AliasList aliasList, AliasList aliasList,
Channel channel) Channel channel, Metadata metadata)
{ {
List<Module> modules = new ArrayList<Module>(); List<Module> modules = new ArrayList<Module>();
@@ -162,11 +144,6 @@ public class DecoderFactory
int iqPass = decodeConfig.getDecoderType().getChannelBandwidth() / 2; int iqPass = decodeConfig.getDecoderType().getChannelBandwidth() / 2;
int iqStop = iqPass + 1250; int iqStop = iqPass + 1250;
RecordConfiguration recordConfig = channel.getRecordConfiguration();
boolean recordAudio = recordConfig == null ? false :
recordConfig.getRecorders().contains(RecorderType.AUDIO);
switch(decodeConfig.getDecoderType()) switch(decodeConfig.getDecoderType())
{ {
case AM: case AM:
@@ -174,14 +151,14 @@ public class DecoderFactory
modules.add(new AlwaysUnsquelchedDecoderState(DecoderType.AM, channel.getName())); modules.add(new AlwaysUnsquelchedDecoderState(DecoderType.AM, channel.getName()));
modules.add(new AMDemodulatorModule()); modules.add(new AMDemodulatorModule());
modules.add(new DemodulatedAudioFilterModule(4000, 6000)); modules.add(new DemodulatedAudioFilterModule(4000, 6000));
modules.add(new AudioModule(recordAudio)); modules.add(new AudioModule(metadata));
break; break;
case NBFM: case NBFM:
modules.add(new NBFMDecoder(decodeConfig)); modules.add(new NBFMDecoder(decodeConfig));
modules.add(new AlwaysUnsquelchedDecoderState(DecoderType.NBFM, channel.getName())); modules.add(new AlwaysUnsquelchedDecoderState(DecoderType.NBFM, channel.getName()));
modules.add(new FMDemodulatorModule(iqPass, iqStop)); modules.add(new FMDemodulatorModule(iqPass, iqStop));
modules.add(new DemodulatedAudioFilterModule(4000, 6000)); modules.add(new DemodulatedAudioFilterModule(4000, 6000));
modules.add(new AudioModule(recordAudio)); modules.add(new AudioModule(metadata));
break; break;
case LTR_STANDARD: case LTR_STANDARD:
MessageDirection direction = ((DecodeConfigLTRStandard) decodeConfig).getMessageDirection(); MessageDirection direction = ((DecodeConfigLTRStandard) decodeConfig).getMessageDirection();
@@ -189,49 +166,46 @@ public class DecoderFactory
modules.add(new LTRStandardDecoderState(aliasList)); modules.add(new LTRStandardDecoderState(aliasList));
modules.add(new FMDemodulatorModule(iqPass, iqStop)); modules.add(new FMDemodulatorModule(iqPass, iqStop));
modules.add(new DemodulatedAudioFilterModule(4000, 6000)); modules.add(new DemodulatedAudioFilterModule(4000, 6000));
modules.add(new AudioModule(recordAudio)); modules.add(new AudioModule(metadata));
break; break;
case LTR_NET: case LTR_NET:
modules.add(new LTRNetDecoder((DecodeConfigLTRNet) decodeConfig, aliasList)); modules.add(new LTRNetDecoder((DecodeConfigLTRNet) decodeConfig, aliasList));
modules.add(new LTRNetDecoderState(aliasList)); modules.add(new LTRNetDecoderState(aliasList));
modules.add(new FMDemodulatorModule(iqPass, iqStop)); modules.add(new FMDemodulatorModule(iqPass, iqStop));
modules.add(new DemodulatedAudioFilterModule(4000, 6000)); modules.add(new DemodulatedAudioFilterModule(4000, 6000));
modules.add(new AudioModule(recordAudio)); modules.add(new AudioModule(metadata));
break; break;
case MPT1327: case MPT1327:
DecodeConfigMPT1327 mptConfig = (DecodeConfigMPT1327) decodeConfig; DecodeConfigMPT1327 mptConfig = (DecodeConfigMPT1327) decodeConfig;
ChannelMap channelMap = channelMapModel ChannelMap channelMap = channelMapModel.getChannelMap(mptConfig.getChannelMapName());
.getChannelMap(mptConfig.getChannelMapName());
Sync sync = mptConfig.getSync(); Sync sync = mptConfig.getSync();
modules.add(new MPT1327Decoder(aliasList, sync)); modules.add(new MPT1327Decoder(aliasList, sync));
modules.add(new MPT1327DecoderState(aliasList, channelMap, modules.add(new MPT1327DecoderState(aliasList, channelMap, channelType, mptConfig.getCallTimeout() * 1000));
channelType, mptConfig.getCallTimeout() * 1000));
if(channelType == ChannelType.STANDARD) if(channelType == ChannelType.STANDARD)
{ {
long timeout = mptConfig.getCallTimeout() * 1000; //convert to milliseconds long timeout = mptConfig.getCallTimeout() * 1000; //convert to milliseconds
modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
decodeConfig, recordConfig, channel.getSystem(), channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
channel.getSite(), (aliasList != null ? aliasList.getName() : null), timeout, (aliasList != null ? aliasList.getName() : null), timeout, mptConfig.getTrafficChannelPoolSize()));
mptConfig.getTrafficChannelPoolSize()));
} }
modules.add(new FMDemodulatorModule(iqPass, iqStop)); modules.add(new FMDemodulatorModule(iqPass, iqStop));
modules.add(new DemodulatedAudioFilterModule(4000, 6000)); modules.add(new DemodulatedAudioFilterModule(4000, 6000));
modules.add(new AudioModule(recordAudio)); modules.add(new AudioModule(metadata));
break; break;
case PASSPORT: case PASSPORT:
modules.add(new PassportDecoder(decodeConfig, aliasList)); modules.add(new PassportDecoder(decodeConfig, aliasList));
modules.add(new PassportDecoderState(aliasList)); modules.add(new PassportDecoderState(aliasList));
modules.add(new FMDemodulatorModule(iqPass, iqStop)); modules.add(new FMDemodulatorModule(iqPass, iqStop));
modules.add(new DemodulatedAudioFilterModule(4000, 6000)); modules.add(new DemodulatedAudioFilterModule(4000, 6000));
modules.add(new AudioModule(recordAudio)); modules.add(new AudioModule(metadata));
break; break;
case P25_PHASE1: case P25_PHASE1:
DecodeConfigP25Phase1 p25Config = (DecodeConfigP25Phase1) decodeConfig; DecodeConfigP25Phase1 p25Config = (DecodeConfigP25Phase1) decodeConfig;
@@ -244,17 +218,15 @@ public class DecoderFactory
case C4FM: case C4FM:
modules.add(new FMDemodulatorModule(6750, 7500)); modules.add(new FMDemodulatorModule(6750, 7500));
modules.add(new P25_C4FMDecoder(aliasList, decodeConfig.getAFCMaximumCorrection())); modules.add(new P25_C4FMDecoder(aliasList, decodeConfig.getAFCMaximumCorrection()));
modules.add(new P25DecoderState(aliasList, channelType, modules.add(new P25DecoderState(aliasList, channelType, Modulation.C4FM,
Modulation.C4FM, p25Config.getIgnoreDataCalls())); p25Config.getIgnoreDataCalls()));
break; break;
case CQPSK: case CQPSK:
modules.add(new P25_LSMDecoder(aliasList)); modules.add(new P25_LSMDecoder(aliasList));
modules.add(new P25DecoderState(aliasList, channelType, modules.add(new P25DecoderState(aliasList, channelType, Modulation.CQPSK, p25Config.getIgnoreDataCalls()));
Modulation.CQPSK, p25Config.getIgnoreDataCalls()));
break; break;
default: default:
throw new IllegalArgumentException("Unrecognized P25 " throw new IllegalArgumentException("Unrecognized P25 Phase 1 Modulation [" + modulation + "]");
+ "Phase 1 Modulation [" + modulation + "]");
} }
if(channelType == ChannelType.STANDARD) if(channelType == ChannelType.STANDARD)
@@ -262,19 +234,15 @@ public class DecoderFactory
//Set call timeout to 3 seconds for P25 traffic channels //Set call timeout to 3 seconds for P25 traffic channels
long timeout = 3000; long timeout = 3000;
modules.add(new TrafficChannelManager(channelModel, modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
channelProcessingManager, decodeConfig, channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
recordConfig, channel.getSystem(), channel.getSite(), (aliasList != null ? aliasList.getName() : null), timeout, p25Config.getTrafficChannelPoolSize()));
(aliasList != null ? aliasList.getName() : null), timeout,
p25Config.getTrafficChannelPoolSize()));
} }
modules.add(new P25AudioModule(recordAudio)); modules.add(new P25AudioModule(metadata));
break; break;
default: default:
throw new IllegalArgumentException( throw new IllegalArgumentException("Unknown decoder type [" + decodeConfig.getDecoderType().toString() + "]");
"Unknown decoder type [" +
decodeConfig.getDecoderType().toString() + "]");
} }
return modules; return modules;
@@ -324,39 +292,6 @@ public class DecoderFactory
return modules; return modules;
} }
public static DecoderPanel getDecoderPanel(IconManager iconManager, SettingsManager settingsManager,
DecoderState decoderState)
{
switch(decoderState.getDecoderType())
{
case AM:
return new AMDecoderPanel(iconManager, settingsManager, decoderState);
case FLEETSYNC2:
return new Fleetsync2DecoderPanel(iconManager, settingsManager, (Fleetsync2DecoderState) decoderState);
case LJ_1200:
return new LJ1200DecoderPanel(iconManager, settingsManager, (LJ1200DecoderState) decoderState);
case LTR_NET:
return new LTRNetDecoderPanel(iconManager, settingsManager, (LTRNetDecoderState) decoderState);
case LTR_STANDARD:
return new LTRStandardDecoderPanel(iconManager, settingsManager, (LTRStandardDecoderState) decoderState);
case MDC1200:
return new MDCDecoderPanel(iconManager, settingsManager, (MDCDecoderState) decoderState);
case MPT1327:
return new MPT1327DecoderPanel(iconManager, settingsManager, (MPT1327DecoderState) decoderState);
case NBFM:
return new NBFMDecoderPanel(iconManager, settingsManager, decoderState);
case P25_PHASE1:
return new P25DecoderPanel(iconManager, settingsManager, (P25DecoderState) decoderState);
case PASSPORT:
return new PassportDecoderPanel(iconManager, settingsManager, (PassportDecoderState) decoderState);
case TAIT_1200:
return new Tait1200DecoderPanel(iconManager, settingsManager, (Tait1200DecoderState) decoderState);
default:
throw new IllegalArgumentException("Unrecognized decoder: " +
decoderState.getDecoderType().getDisplayString());
}
}
/** /**
* Assembles a filter set containing filters for the primary channel * Assembles a filter set containing filters for the primary channel
* decoder and each of the auxiliary decoders * decoder and each of the auxiliary decoders
@@ -451,8 +386,7 @@ public class DecoderFactory
case P25_PHASE1: case P25_PHASE1:
return new DecodeConfigP25Phase1(); return new DecodeConfigP25Phase1();
default: default:
throw new IllegalArgumentException("DecodeConfigFactory - unknown decoder type [" throw new IllegalArgumentException("DecodeConfigFactory - unknown decoder type [" + decoder.toString() + "]");
+ decoder.toString() + "]");
} }
} }
@@ -542,25 +476,10 @@ public class DecoderFactory
copyPass.setAFCMaximumCorrection(originalPass.getAFCMaximumCorrection()); copyPass.setAFCMaximumCorrection(originalPass.getAFCMaximumCorrection());
return copyPass; return copyPass;
default: default:
throw new IllegalArgumentException("Unrecognized decoder " throw new IllegalArgumentException("Unrecognized decoder configuration type:" + config.getDecoderType());
+ "configuration type:" + config.getDecoderType());
} }
} }
return null; return null;
} }
public static String getRecordingFilename(String token)
{
//Get the base recording filename
StringBuilder sb = new StringBuilder();
sb.append(SystemProperties.getInstance()
.getApplicationFolder("recordings"));
sb.append(File.separator);
sb.append(TimeStamp.getTimeStamp("_"));
sb.append("_");
sb.append(token);
return sb.toString();
}
} }

View File

@@ -1,84 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.am;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import channel.state.DecoderState;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
public class AMDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("AM");
public AMDecoderPanel(IconManager iconManager, SettingsManager settingsManager, DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
add(mProtocol, "wrap");
}
@Override
public void receive(final Attribute attribute)
{
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
if(mProtocol != null)
{
mProtocol.setForeground(mColorLabelDecoder);
}
break;
default:
break;
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,16 +14,16 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.event; package module.decode.event;
import java.text.SimpleDateFormat;
import java.util.Date;
import module.decode.DecoderType;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import audio.metadata.MetadataType; import module.decode.DecoderType;
import java.text.SimpleDateFormat;
import java.util.Date;
public abstract class CallEvent implements Comparable<CallEvent> public abstract class CallEvent implements Comparable<CallEvent>
{ {
@@ -41,12 +41,8 @@ public abstract class CallEvent implements Comparable<CallEvent>
private boolean mValid = true; private boolean mValid = true;
public CallEvent( DecoderType decoder, public CallEvent(DecoderType decoder, CallEventType callEventType, AliasList aliasList, String fromID,
CallEventType callEventType, String toID, String details)
AliasList aliasList,
String fromID,
String toID,
String details )
{ {
mDecoderType = decoder; mDecoderType = decoder;
mCallEventType = callEventType; mCallEventType = callEventType;
@@ -131,11 +127,6 @@ public abstract class CallEvent implements Comparable<CallEvent>
return mFromID != null; return mFromID != null;
} }
public MetadataType getFromIDType()
{
return MetadataType.FROM;
}
public void setFromID(String id) public void setFromID(String id)
{ {
mFromID = id; mFromID = id;
@@ -156,11 +147,6 @@ public abstract class CallEvent implements Comparable<CallEvent>
mToID = id; mToID = id;
} }
public MetadataType getToIDType()
{
return MetadataType.TO;
}
public String getDetails() public String getDetails()
{ {
return mDetails; return mDetails;
@@ -181,9 +167,8 @@ public abstract class CallEvent implements Comparable<CallEvent>
public static String getCSVHeader() public static String getCSVHeader()
{ {
return "START_DATE,START_TIME,END_DATE,END_TIME," return "START_DATE,START_TIME,END_DATE,END_TIME,DECODER,EVENT,FROM,FROM_ALIAS,TO,TO_ALIAS,CHANNEL," +
+ "DECODER,EVENT,FROM,FROM_ALIAS,TO,TO_ALIAS," "FREQUENCY,DETAILS";
+ "CHANNEL,FREQUENCY,DETAILS";
} }
public String toCSV() public String toCSV()

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,37 +14,12 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.event; package module.decode.event;
import java.awt.EventQueue;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JSlider;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import message.Message;
import module.ProcessingChain;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.jidesoft.swing.JideButton; import com.jidesoft.swing.JideButton;
import com.jidesoft.swing.JideSplitButton; import com.jidesoft.swing.JideSplitButton;
import controller.channel.Channel; import controller.channel.Channel;
import controller.channel.ChannelEvent; import controller.channel.ChannelEvent;
import controller.channel.ChannelEvent.Event; import controller.channel.ChannelEvent.Event;
@@ -52,13 +27,26 @@ import controller.channel.ChannelEventListener;
import controller.channel.ChannelProcessingManager; import controller.channel.ChannelProcessingManager;
import filter.FilterEditorPanel; import filter.FilterEditorPanel;
import filter.FilterSet; import filter.FilterSet;
import message.Message;
import module.ProcessingChain;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
public class MessageActivityPanel extends JPanel implements ChannelEventListener public class MessageActivityPanel extends JPanel implements ChannelEventListener
{ {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final static Logger mLog = private final static Logger mLog = LoggerFactory.getLogger(MessageActivityPanel.class);
LoggerFactory.getLogger( MessageActivityPanel.class );
private static MessageActivityModel EMPTY_MODEL = new MessageActivityModel(); private static MessageActivityModel EMPTY_MODEL = new MessageActivityModel();
@@ -92,14 +80,11 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE && if(event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
event.getChannel().isSelected()) event.getChannel().isSelected())
{ {
if( mDisplayedChannel == null || if(mDisplayedChannel == null || (mDisplayedChannel != null && mDisplayedChannel != event.getChannel()))
( mDisplayedChannel != null &&
mDisplayedChannel != event.getChannel() ) )
{ {
mDisplayedChannel = event.getChannel(); mDisplayedChannel = event.getChannel();
ProcessingChain chain = mChannelProcessingManager ProcessingChain chain = mChannelProcessingManager.getProcessingChain(mDisplayedChannel);
.getProcessingChain( mDisplayedChannel );
if(chain != null) if(chain != null)
{ {
@@ -114,27 +99,25 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
if(mDisplayedChannel != null) if(mDisplayedChannel != null)
{ {
mManagementPanel.enable(); mManagementPanel.enableButtons();
} }
else else
{ {
mManagementPanel.disable(); mManagementPanel.disableButtons();
} }
changed = true; changed = true;
} }
} }
else if( event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP || else if(event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP || event.getEvent() == Event.REQUEST_DISABLE)
event.getEvent() == Event.REQUEST_DISABLE )
{ {
if( mDisplayedChannel != null && if(mDisplayedChannel != null && mDisplayedChannel == event.getChannel())
mDisplayedChannel == event.getChannel() )
{ {
mDisplayedChannel = null; mDisplayedChannel = null;
mMessageTable.setModel(EMPTY_MODEL); mMessageTable.setModel(EMPTY_MODEL);
mManagementPanel.disable(); mManagementPanel.disableButtons();
changed = true; changed = true;
} }
@@ -158,19 +141,19 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
{ {
setLayout(new MigLayout("insets 2 2 5 5", "[]5[left,grow]", "")); setLayout(new MigLayout("insets 2 2 5 5", "[]5[left,grow]", ""));
disable(); disableButtons();
add(mFilterButton); add(mFilterButton);
add(mHistoryButton); add(mHistoryButton);
} }
public void enable() public void enableButtons()
{ {
mHistoryButton.setEnabled(true); mHistoryButton.setEnabled(true);
mFilterButton.setEnabled(true); mFilterButton.setEnabled(true);
} }
public void disable() public void disableButtons()
{ {
mHistoryButton.setEnabled(false); mHistoryButton.setEnabled(false);
mFilterButton.setEnabled(false); mFilterButton.setEnabled(false);
@@ -208,10 +191,21 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
} }
} }
public void mouseEntered( MouseEvent arg0 ) {} public void mouseEntered(MouseEvent arg0)
public void mouseExited( MouseEvent arg0 ) {} {
public void mousePressed( MouseEvent arg0 ) {} }
public void mouseReleased( MouseEvent arg0 ) {}
public void mouseExited(MouseEvent arg0)
{
}
public void mousePressed(MouseEvent arg0)
{
}
public void mouseReleased(MouseEvent arg0)
{
}
}); });
if(mDisplayedModel != null) if(mDisplayedModel != null)

View File

@@ -1,201 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.fleetsync2;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class Fleetsync2DecoderPanel extends DecoderPanel
{
private final static Logger mLog = LoggerFactory.getLogger(Fleetsync2DecoderPanel.class);
private static final long serialVersionUID = 1L;
private static final String PROTOCOL = "FSync II";
private JLabel mToLabel = new JLabel(" ");
private JLabel mTo = new JLabel(" ");
private JLabel mToAlias = new JLabel(" ");
private JLabel mFromLabel = new JLabel(" ");
private JLabel mFrom = new JLabel(" ");
private JLabel mFromAlias = new JLabel(" ");
private JLabel mProtocol = new JLabel(PROTOCOL);
private JLabel mMessage = new JLabel(" ");
private JLabel mMessageType = new JLabel(" ");
public Fleetsync2DecoderPanel(IconManager iconManager, SettingsManager settingsManager,
Fleetsync2DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
@Override
public Fleetsync2DecoderState getDecoderState()
{
return (Fleetsync2DecoderState) super.getDecoderState();
}
public void dispose()
{
super.dispose();
}
protected void init()
{
/* Calling super init will get and broadcast color settings to properly
* setup the jlabel colors */
super.init();
setLayout(new MigLayout("insets 1 0 0 0", "[grow,fill]", "[]0[]0[]"));
mToLabel.setFont(mFontAuxDecoder);
mToLabel.setForeground(mColorLabelAuxDecoder);
add(mToLabel);
mTo.setFont(mFontAuxDecoder);
mTo.setForeground(mColorLabelAuxDecoder);
add(mTo);
mToAlias.setFont(mFontAuxDecoder);
mToAlias.setForeground(mColorLabelAuxDecoder);
add(mToAlias, "wrap");
mFromLabel.setFont(mFontAuxDecoder);
mFromLabel.setForeground(mColorLabelAuxDecoder);
add(mFromLabel);
mFrom.setFont(mFontAuxDecoder);
mFrom.setForeground(mColorLabelAuxDecoder);
add(mFrom);
mFromAlias.setFont(mFontAuxDecoder);
mFromAlias.setForeground(mColorLabelAuxDecoder);
add(mFromAlias, "wrap");
mProtocol.setFont(mFontAuxDecoder);
mProtocol.setForeground(mColorLabelAuxDecoder);
add(mProtocol);
mMessageType.setFont(mFontAuxDecoder);
mMessageType.setForeground(mColorLabelAuxDecoder);
add(mMessageType);
mMessage.setFont(mFontAuxDecoder);
mMessage.setForeground(mColorLabelAuxDecoder);
add(mMessage, "wrap");
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case FROM_TALKGROUP:
String from = getDecoderState().getFromID();
if(from != null)
{
mFromLabel.setText("FROM:");
mFrom.setText(from);
}
else
{
mFromLabel.setText(" ");
mFrom.setText(" ");
}
break;
case FROM_TALKGROUP_ALIAS:
setAliasLabel(mFromAlias, getDecoderState().getFromIDAlias());
break;
case MESSAGE:
mMessage.setText(getDecoderState().getMessage());
break;
case MESSAGE_TYPE:
mMessageType.setText(getDecoderState().getMessageType());
break;
case TO_TALKGROUP:
String to = getDecoderState().getToID();
if(to != null)
{
mToLabel.setText("TO:");
mTo.setText(to);
}
else
{
mToLabel.setText(" ");
mTo.setText(" ");
}
break;
case TO_TALKGROUP_ALIAS:
setAliasLabel(mToAlias, getDecoderState().getToIDAlias());
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting color = (ColorSetting) setting;
if(color.getColorSettingName() ==
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER)
{
mFromLabel.setForeground(color.getColor());
mFrom.setForeground(color.getColor());
mFromAlias.setForeground(color.getColor());
mToLabel.setForeground(color.getColor());
mTo.setForeground(color.getColor());
mToAlias.setForeground(color.getColor());
mProtocol.setForeground(color.getColor());
mMessageType.setForeground(color.getColor());
mMessage.setForeground(color.getColor());
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014,2015 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,18 +14,21 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.fleetsync2; package module.decode.fleetsync2;
import alias.Alias; import alias.Alias;
import alias.AliasList; import alias.AliasList;
import channel.metadata.Attribute; import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState; import channel.state.DecoderState;
import channel.state.DecoderStateEvent; import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event; import channel.state.DecoderStateEvent.Event;
import channel.state.State; import channel.state.State;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
import util.StringUtils;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
@@ -116,7 +119,6 @@ public class Fleetsync2DecoderState extends DecoderState
State state = State.CALL; State state = State.CALL;
setFromID(fleetsync.getFromID()); setFromID(fleetsync.getFromID());
setFromIDAlias(fleetsync.getFromIDAlias());
mIdents.add(fleetsync.getFromID()); mIdents.add(fleetsync.getFromID());
FleetsyncMessageType type = fleetsync.getMessageType(); FleetsyncMessageType type = fleetsync.getMessageType();
@@ -124,7 +126,6 @@ public class Fleetsync2DecoderState extends DecoderState
if(type != FleetsyncMessageType.ANI) if(type != FleetsyncMessageType.ANI)
{ {
setToID(fleetsync.getToID()); setToID(fleetsync.getToID());
setToIDAlias(fleetsync.getToIDAlias());
mIdents.add(fleetsync.getToID()); mIdents.add(fleetsync.getToID());
} }
@@ -179,22 +180,19 @@ public class Fleetsync2DecoderState extends DecoderState
return mFrom; return mFrom;
} }
public void setFromID(String from)
{
mFrom = from;
broadcast(Attribute.FROM_TALKGROUP);
}
public Alias getFromIDAlias() public Alias getFromIDAlias()
{ {
return mFromAlias; return mFromAlias;
} }
public void setFromIDAlias(Alias alias) public void setFromID(String from)
{ {
mFromAlias = alias; if(!StringUtils.isEqual(mFrom, from))
broadcast(Attribute.FROM_TALKGROUP_ALIAS); {
mFrom = from;
mFromAlias = hasAliasList() ? getAliasList().getFleetsyncAlias(mFrom) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, mFrom, mFromAlias));
}
} }
public String getToID() public String getToID()
@@ -202,21 +200,19 @@ public class Fleetsync2DecoderState extends DecoderState
return mTo; return mTo;
} }
public void setToID(String to)
{
mTo = to;
broadcast(Attribute.TO_TALKGROUP);
}
public Alias getToIDAlias() public Alias getToIDAlias()
{ {
return mToAlias; return mToAlias;
} }
public void setToIDAlias(Alias alias) public void setToID(String to)
{ {
mToAlias = alias; if(!StringUtils.isEqual(mTo, to))
broadcast(Attribute.TO_TALKGROUP_ALIAS); {
mTo = to;
mToAlias = hasAliasList() ? getAliasList().getFleetsyncAlias(mTo) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mTo, mToAlias));
}
} }
public String getMessage() public String getMessage()
@@ -225,20 +221,26 @@ public class Fleetsync2DecoderState extends DecoderState
} }
public void setMessage(String message) public void setMessage(String message)
{
if(!StringUtils.isEqual(mMessage, message))
{ {
mMessage = message; mMessage = message;
broadcast(Attribute.MESSAGE); broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE, mMessage));
}
} }
public String getMessageType() public String getMessageType()
{ {
return mMessageType; return "Fleetsync " + mMessageType;
} }
public void setMessageType(String type) public void setMessageType(String type)
{
if(!StringUtils.isEqual(mMessageType, type))
{ {
mMessageType = type; mMessageType = type;
broadcast(Attribute.MESSAGE_TYPE); broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE_TYPE, getMessageType()));
}
} }
/** /**

View File

@@ -1,127 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.lj1200;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
public class LJ1200DecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private static final String PROTOCOL = "LJ-1200";
private JLabel mProtocol = new JLabel(PROTOCOL);
private JLabel mTo = new JLabel();
private JLabel mToAlias = new JLabel();
public LJ1200DecoderPanel(IconManager iconManager, SettingsManager settingsManager, LJ1200DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public void dispose()
{
super.dispose();
}
protected void init()
{
/* Calling super init will get and broadcast color settings to properly
* setup the jlabel colors */
super.init();
setLayout(new MigLayout("insets 1 0 0 0", "[grow,fill]", ""));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
mTo.setFont(mFontDecoder);
mTo.setForeground(mColorLabelDecoder);
mToAlias.setFont(mFontDecoder);
mToAlias.setForeground(mColorLabelDecoder);
add(mProtocol);
add(mTo);
add(mToAlias, "wrap");
}
public LJ1200DecoderState getDecoderState()
{
return (LJ1200DecoderState) super.getDecoderState();
}
@Override
public void receive(final Attribute attribute)
{
switch(attribute)
{
case TO_TALKGROUP:
mTo.setText(getDecoderState().getAddress());
repaint();
break;
case TO_TALKGROUP_ALIAS:
Alias alias = getDecoderState().getAddressAlias();
if(alias != null)
{
mToAlias.setText(alias.getName());
}
else
{
mToAlias.setText("");
}
repaint();
break;
default:
break;
}
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting color = (ColorSetting) setting;
if(color.getColorSettingName() ==
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER)
{
mProtocol.setForeground(color.getColor());
mTo.setForeground(color.getColor());
mToAlias.setForeground(color.getColor());
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014,2015 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,24 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.lj1200; package module.decode.lj1200;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import message.Message;
import module.decode.DecoderType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -24,20 +39,6 @@ import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import module.decode.DecoderType;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
public class LJ1200DecoderState extends DecoderState public class LJ1200DecoderState extends DecoderState
{ {
private final static Logger mLog = LoggerFactory.getLogger(LJ1200DecoderState.class); private final static Logger mLog = LoggerFactory.getLogger(LJ1200DecoderState.class);
@@ -104,15 +105,18 @@ public class LJ1200DecoderState extends DecoderState
} }
private void setAddress(String address) private void setAddress(String address)
{
if(!StringUtils.isEqual(mAddress, address))
{ {
mAddress = address; mAddress = address;
broadcast( Attribute.TO_TALKGROUP ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mAddress, mAddressAlias));
}
} }
private void setAddressAlias(Alias alias) private void setAddressAlias(Alias alias)
{ {
mAddressAlias = alias; mAddressAlias = alias;
broadcast( Attribute.TO_TALKGROUP_ALIAS ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mAddress, mAddressAlias));
} }
@Override @Override
@@ -159,10 +163,8 @@ public class LJ1200DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
setAddress( null ); mAddress = null;
broadcast( Attribute.TO_TALKGROUP ); mAddressAlias = null;
setAddressAlias( null );
broadcast( Attribute.TO_TALKGROUP_ALIAS );
} }
@Override @Override

View File

@@ -1,157 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.ltrnet;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class LTRNetDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("LTR-Net");
private JLabel mTalkgroup = new JLabel();
private JLabel mTalkgroupAlias = new JLabel();
private JLabel mLCN = new JLabel("LCN:");
private JLabel mDescription = new JLabel();
public LTRNetDecoderPanel(IconManager iconManager, SettingsManager settingsManager, LTRNetDecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
mTalkgroup.setFont(mFontDecoder);
mTalkgroup.setForeground(mColorLabelDecoder);
mTalkgroupAlias.setFont(mFontDecoder);
mTalkgroupAlias.setForeground(mColorLabelDecoder);
mLCN.setFont(mFontDecoder);
mLCN.setForeground(mColorLabelDecoder);
mDescription.setFont(mFontDecoder);
mDescription.setForeground(mColorLabelDecoder);
add(mProtocol);
add(mTalkgroup);
add(mTalkgroupAlias, "wrap");
add(mLCN);
add(mDescription, "span");
}
public LTRNetDecoderState getDecoderState()
{
return (LTRNetDecoderState) super.getDecoderState();
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
LTRNetDecoderState state = getDecoderState();
switch(attribute)
{
case TO_TALKGROUP:
mTalkgroup.setText(state.getToTalkgroup());
break;
case TO_TALKGROUP_ALIAS:
Alias tgAlias = state.getToTalkgroupAlias();
setAliasLabel(mTalkgroupAlias, tgAlias);
break;
case DESCRIPTION:
mDescription.setText(state.getDescription());
break;
case CHANNEL_NUMBER:
mLCN.setText("LCN: " + state.getChannelNumber());
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
if(mProtocol != null)
{
mProtocol.setForeground(mColorLabelDecoder);
}
if(mTalkgroup != null)
{
mTalkgroup.setForeground(mColorLabelDecoder);
}
if(mTalkgroupAlias != null)
{
mTalkgroupAlias.setForeground(mColorLabelDecoder);
}
if(mLCN != null)
{
mLCN.setForeground(mColorLabelDecoder);
}
if(mDescription != null)
{
mDescription.setForeground(mColorLabelDecoder);
}
break;
default:
break;
}
}
}
}

View File

@@ -17,30 +17,28 @@
******************************************************************************/ ******************************************************************************/
package module.decode.ltrnet; package module.decode.ltrnet;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.StringUtils;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
public class LTRNetDecoderState extends DecoderState public class LTRNetDecoderState extends DecoderState
{ {
private final static Logger mLog = LoggerFactory.getLogger(LTRNetDecoderState.class); private final static Logger mLog = LoggerFactory.getLogger(LTRNetDecoderState.class);
@@ -59,9 +57,12 @@ public class LTRNetDecoderState extends DecoderState
new HashMap<Integer,Long>(); new HashMap<Integer,Long>();
private HashMap<Integer,String> mActiveCalls = new HashMap<Integer,String>(); private HashMap<Integer,String> mActiveCalls = new HashMap<Integer,String>();
private String mTalkgroup; private String mToTalkgroup;
private Alias mTalkgroupAlias; private Alias mToTalkgroupAlias;
private String mDescription; private String mFromTalkgroup;
private Alias mFromTalkgroupAlias;
private String mMessage;
private String mMessageType;
private int mChannelNumber; private int mChannelNumber;
private long mFrequency = 0; private long mFrequency = 0;
@@ -92,8 +93,7 @@ public class LTRNetDecoderState extends DecoderState
case CA_ENDD: case CA_ENDD:
if(mChannelNumber == 0) if(mChannelNumber == 0)
{ {
mChannelNumber = ltr.getChannel(); setChannelNumber(ltr.getChannel());
broadcast(Attribute.CHANNEL_NUMBER);
} }
/* Process FCC Station ID Events */ /* Process FCC Station ID Events */
@@ -113,13 +113,11 @@ public class LTRNetDecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this, Event.START, State.DATA));
Event.START, State.DATA));
} }
else else
{ {
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.DATA));
Event.CONTINUATION, State.DATA));
} }
} }
else else
@@ -130,8 +128,7 @@ public class LTRNetDecoderState extends DecoderState
case CA_STRT: case CA_STRT:
if(mChannelNumber == 0) if(mChannelNumber == 0)
{ {
mChannelNumber = ltr.getChannel(); setChannelNumber(ltr.getChannel());
broadcast(Attribute.CHANNEL_NUMBER);
} }
/* If the call event channel matches our current channel /* If the call event channel matches our current channel
@@ -149,8 +146,7 @@ public class LTRNetDecoderState extends DecoderState
case SY_IDLE: case SY_IDLE:
if(mChannelNumber != ltr.getChannel()) if(mChannelNumber != ltr.getChannel())
{ {
mChannelNumber = ltr.getChannel(); setChannelNumber(ltr.getChannel());
broadcast(Attribute.CHANNEL_NUMBER);
} }
break; break;
case MA_CHNH: case MA_CHNH:
@@ -161,16 +157,14 @@ public class LTRNetDecoderState extends DecoderState
case FQ_RXLO: case FQ_RXLO:
if(ltr.getFrequency() > 0) if(ltr.getFrequency() > 0)
{ {
mReceiveFrequencies.put(ltr.getHomeRepeater(), mReceiveFrequencies.put(ltr.getHomeRepeater(), ltr.getFrequency());
ltr.getFrequency());
} }
break; break;
case FQ_TXHI: case FQ_TXHI:
case FQ_TXLO: case FQ_TXLO:
if(ltr.getFrequency() > 0) if(ltr.getFrequency() > 0)
{ {
mTransmitFrequencies.put(ltr.getHomeRepeater(), mTransmitFrequencies.put(ltr.getHomeRepeater(), ltr.getFrequency());
ltr.getFrequency());
} }
break; break;
case ID_NBOR: case ID_NBOR:
@@ -210,11 +204,8 @@ public class LTRNetDecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
} }
mTalkgroup = String.valueOf(uniqueID); setFromTalkgroup(String.valueOf(uniqueID));
broadcast(Attribute.TO_TALKGROUP); setFromTalkgroupAlias(ltr.getRadioUniqueIDAlias());
mTalkgroupAlias = ltr.getRadioUniqueIDAlias();
broadcast(Attribute.TO_TALKGROUP_ALIAS);
break; break;
case ID_SITE: case ID_SITE:
String siteID = ltr.getSiteID(); String siteID = ltr.getSiteID();
@@ -251,14 +242,9 @@ public class LTRNetDecoderState extends DecoderState
mESNs.add(ltr.getESN()); mESNs.add(ltr.getESN());
} }
mDescription = "ESN"; setMessageType("ESN");
broadcast(Attribute.DESCRIPTION); setFromTalkgroup(ltr.getESN());
setFromTalkgroupAlias(ltr.getESNAlias());
mTalkgroup = ltr.getESN();
broadcast(Attribute.TO_TALKGROUP);
mTalkgroupAlias = ltr.getESNAlias();
broadcast(Attribute.TO_TALKGROUP_ALIAS);
broadcast(new DecoderStateEvent(this, Event.DECODE, State.DATA)); broadcast(new DecoderStateEvent(this, Event.DECODE, State.DATA));
@@ -285,14 +271,9 @@ public class LTRNetDecoderState extends DecoderState
{ {
mUniqueIDs.add(uniqueid); mUniqueIDs.add(uniqueid);
mDescription = "REGISTER UID"; setMessageType("REGISTER UID");
broadcast(Attribute.DESCRIPTION); setToTalkgroup(String.valueOf(uniqueid));
setToTalkgroupAlias(ltr.getRadioUniqueIDAlias());
mTalkgroup = String.valueOf(uniqueid);
broadcast(Attribute.TO_TALKGROUP);
mTalkgroupAlias = ltr.getRadioUniqueIDAlias();
broadcast(Attribute.TO_TALKGROUP_ALIAS);
if(getCurrentLTRCallEvent() == null) if(getCurrentLTRCallEvent() == null)
{ {
@@ -618,9 +599,8 @@ public class LTRNetDecoderState extends DecoderState
/* Process call registration */ /* Process call registration */
if(group == 253) if(group == 253)
{ {
setMessageType("REGISTER");
broadcast(new DecoderStateEvent(this, Event.START, State.DATA)); broadcast(new DecoderStateEvent(this, Event.START, State.DATA));
mDescription = "REGISTER";
broadcast(Attribute.DESCRIPTION);
} }
/* Process call */ /* Process call */
else else
@@ -642,23 +622,21 @@ public class LTRNetDecoderState extends DecoderState
broadcast(current); broadcast(current);
} }
mTalkgroup = message.getTalkgroupID(); setToTalkgroup(message.getTalkgroupID());
broadcast(Attribute.TO_TALKGROUP);
/* A talkgroup must be seen at least once before it will be added /* A talkgroup must be seen at least once before it will be added
* to the mTalkgroups list that is used in the activity summary, * to the mTalkgroups list that is used in the activity summary,
* so that we don't pollute the summary with one-off error talkgroups */ * so that we don't pollute the summary with one-off error talkgroups */
if (mTalkgroupsFirstHeard.contains(mTalkgroup)) if(mTalkgroupsFirstHeard.contains(mToTalkgroup))
{ {
mTalkgroups.add(mTalkgroup); mTalkgroups.add(mToTalkgroup);
} }
else else
{ {
mTalkgroupsFirstHeard.add(mTalkgroup); mTalkgroupsFirstHeard.add(mToTalkgroup);
} }
mTalkgroupAlias = message.getTalkgroupIDAlias(); setToTalkgroupAlias(message.getTalkgroupIDAlias());
broadcast(Attribute.TO_TALKGROUP_ALIAS);
CallEvent callEvent = new LTRCallEvent.Builder(DecoderType.LTR_NET, CallEventType.CALL) CallEvent callEvent = new LTRCallEvent.Builder(DecoderType.LTR_NET, CallEventType.CALL)
.aliasList(getAliasList()) .aliasList(getAliasList())
@@ -671,8 +649,6 @@ public class LTRNetDecoderState extends DecoderState
mCurrentCallEvent = callEvent; mCurrentCallEvent = callEvent;
broadcast(new Metadata(MetadataType.TO, mTalkgroup, mTalkgroupAlias, true));
broadcast(new DecoderStateEvent(this, Event.START, State.CALL)); broadcast(new DecoderStateEvent(this, Event.START, State.CALL));
} }
@@ -728,29 +704,97 @@ public class LTRNetDecoderState extends DecoderState
mCurrentCallEvent = null; mCurrentCallEvent = null;
mTalkgroup = null; mToTalkgroup = null;
broadcast(Attribute.TO_TALKGROUP);
mTalkgroupAlias = null; mToTalkgroupAlias = null;
broadcast(Attribute.TO_TALKGROUP_ALIAS);
mDescription = null; mMessageType = null;
broadcast(Attribute.DESCRIPTION);
} }
public String getToTalkgroup() public String getToTalkgroup()
{ {
return mTalkgroup; return mToTalkgroup;
}
public void setToTalkgroup(String toTalkgroup)
{
if(!StringUtils.isEqual(mToTalkgroup, toTalkgroup))
{
mToTalkgroup = toTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup, mToTalkgroupAlias));
}
} }
public Alias getToTalkgroupAlias() public Alias getToTalkgroupAlias()
{ {
return mTalkgroupAlias; return mToTalkgroupAlias;
} }
public String getDescription() public void setToTalkgroupAlias(Alias alias)
{ {
return mDescription; if(mToTalkgroupAlias == null || (alias != null && mToTalkgroupAlias != alias))
{
mToTalkgroupAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup, mToTalkgroupAlias));
}
}
public String getFromTalkgroup()
{
return mFromTalkgroup;
}
public void setFromTalkgroup(String fromTalkgroup)
{
if(!StringUtils.isEqual(mFromTalkgroup, fromTalkgroup))
{
mFromTalkgroup = fromTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
mFromTalkgroupAlias));
}
}
public Alias getFromTalkgroupAlias()
{
return mFromTalkgroupAlias;
}
public void setFromTalkgroupAlias(Alias alias)
{
if(mFromTalkgroupAlias == null || (alias != null && alias != mFromTalkgroupAlias))
{
mFromTalkgroupAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
mFromTalkgroupAlias));
}
}
public String getMessage()
{
return mMessage;
}
public void setMessage(String message)
{
if(!StringUtils.isEqual(mMessage, message))
{
mMessage = message;
broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE, mMessageType));
}
}
public String getMessageType()
{
return mMessageType;
}
private void setMessageType(String messageType)
{
if(!StringUtils.isEqual(mMessageType, messageType))
{
mMessageType = messageType;
broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE_TYPE, mMessageType));
}
} }
public boolean hasChannelNumber() public boolean hasChannelNumber()
@@ -763,6 +807,16 @@ public class LTRNetDecoderState extends DecoderState
return mChannelNumber; return mChannelNumber;
} }
public void setChannelNumber(int channelNumber)
{
if(mChannelNumber != channelNumber)
{
mChannelNumber = channelNumber;
broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_FREQUENCY_LABEL,
"LCN:" + getChannelNumber()));
}
}
@Override @Override
public void init() public void init()
{ {

View File

@@ -1,164 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.ltrstandard;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class LTRStandardDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("LTR Standard");
private JLabel mTalkgroup = new JLabel();
private JLabel mTalkgroupAlias = new JLabel();
private JLabel mLCN = new JLabel("LCN:");
public LTRStandardDecoderPanel(IconManager iconManager, SettingsManager settingsManager,
LTRStandardDecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public void dispose()
{
super.dispose();
}
public void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
mTalkgroup.setFont(mFontDecoder);
mTalkgroup.setForeground(mColorLabelDecoder);
mTalkgroupAlias.setFont(mFontDecoder);
mTalkgroupAlias.setForeground(mColorLabelDecoder);
mLCN.setFont(mFontDecoder);
mLCN.setForeground(mColorLabelDecoder);
add(mProtocol);
add(mTalkgroup);
add(mTalkgroupAlias, "wrap");
add(mLCN, "wrap");
}
public LTRStandardDecoderState getDecoderState()
{
return (LTRStandardDecoderState) super.getDecoderState();
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
LTRStandardDecoderState state = getDecoderState();
switch(attribute)
{
case CHANNEL_NUMBER:
if(state.getChannelNumber() != 0)
{
mLCN.setText("LCN: " + state.getChannelNumber());
}
break;
case TO_TALKGROUP:
mTalkgroup.setText(state.getTalkgroup());
/* fall-through */
case TO_TALKGROUP_ALIAS:
Alias alias = state.getTalkgroupAlias();
if(alias != null)
{
mTalkgroupAlias.setText(alias.getName());
mTalkgroupAlias.setIcon(mIconManager.getIcon(alias.getIconName(),
IconManager.DEFAULT_ICON_SIZE));
}
else
{
mTalkgroupAlias.setText(null);
mTalkgroupAlias.setIcon(null);
}
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
if(mProtocol != null)
{
mProtocol.setForeground(mColorLabelDecoder);
}
if(mTalkgroup != null)
{
mTalkgroup.setForeground(mColorLabelDecoder);
}
if(mTalkgroupAlias != null)
{
mTalkgroupAlias.setForeground(mColorLabelDecoder);
}
if(mLCN != null)
{
mLCN.setForeground(mColorLabelDecoder);
}
break;
default:
break;
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,30 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.ltrstandard; package module.decode.ltrstandard;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent.CallEventType;
import module.decode.ltrnet.LTRCallEvent;
import module.decode.ltrstandard.message.CallEndMessage;
import module.decode.ltrstandard.message.CallMessage;
import module.decode.ltrstandard.message.IdleMessage;
import module.decode.ltrstandard.message.LTRStandardMessage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -26,28 +47,6 @@ import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent.CallEventType;
import module.decode.ltrnet.LTRCallEvent;
import module.decode.ltrstandard.message.CallEndMessage;
import module.decode.ltrstandard.message.CallMessage;
import module.decode.ltrstandard.message.IdleMessage;
import module.decode.ltrstandard.message.LTRStandardMessage;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
public class LTRStandardDecoderState extends DecoderState public class LTRStandardDecoderState extends DecoderState
{ {
private final static Logger mLog = private final static Logger mLog =
@@ -97,7 +96,7 @@ public class LTRStandardDecoderState extends DecoderState
int channel = start.getChannel(); int channel = start.getChannel();
mLCNTracker.processCallChannel( channel ); setChannelNumber(channel);
mLCNTracker.processFreeChannel(start.getFree()); mLCNTracker.processFreeChannel(start.getFree());
@@ -109,8 +108,7 @@ public class LTRStandardDecoderState extends DecoderState
{ {
LTRCallEvent event = mActiveCalls.get(channel); LTRCallEvent event = mActiveCalls.get(channel);
if( event == null || if(event == null || !event.isMatchingTalkgroup(start.getToID()))
!event.isMatchingTalkgroup( start.getToID() ) )
{ {
//Check for different talkgroup //Check for different talkgroup
if(event != null) if(event != null)
@@ -136,21 +134,15 @@ public class LTRStandardDecoderState extends DecoderState
if(mLCNTracker.isCurrentChannel(channel)) if(mLCNTracker.isCurrentChannel(channel))
{ {
mTalkgroup = start.getToID(); setTalkgroup(start.getToID());
broadcast( Attribute.TO_TALKGROUP );
processTalkgroup(mTalkgroup); processTalkgroup(mTalkgroup);
mTalkgroupAlias = start.getToIDAlias(); setTalkgroupAlias(start.getToIDAlias());
broadcast( Attribute.TO_TALKGROUP_ALIAS );
broadcast( new Metadata( MetadataType.TO,
mTalkgroup, mTalkgroupAlias, true ) );
} }
} }
broadcast( new DecoderStateEvent( this, broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.CALL));
Event.CONTINUATION, State.CALL ) );
} }
break; break;
case CA_ENDD: case CA_ENDD:
@@ -160,17 +152,15 @@ public class LTRStandardDecoderState extends DecoderState
//as the call end channel //as the call end channel
int repeater = end.getFree(); int repeater = end.getFree();
mLCNTracker.processCallChannel( repeater ); setChannelNumber(repeater);
if(mLCNTracker.isCurrentChannel(repeater)) if(mLCNTracker.isCurrentChannel(repeater))
{ {
mTalkgroup = end.getToID(); setTalkgroup(end.getToID());
broadcast( Attribute.TO_TALKGROUP );
processTalkgroup(mTalkgroup); processTalkgroup(mTalkgroup);
mTalkgroupAlias = end.getToIDAlias(); setTalkgroupAlias(end.getToIDAlias());
broadcast( Attribute.TO_TALKGROUP_ALIAS );
LTRCallEvent event = mActiveCalls.remove(repeater); LTRCallEvent event = mActiveCalls.remove(repeater);
@@ -242,10 +232,7 @@ public class LTRStandardDecoderState extends DecoderState
mActiveCalls.clear(); mActiveCalls.clear();
mTalkgroup = null; mTalkgroup = null;
broadcast( Attribute.TO_TALKGROUP );
mTalkgroupAlias = null; mTalkgroupAlias = null;
broadcast( Attribute.TO_TALKGROUP_ALIAS );
} }
public String getTalkgroup() public String getTalkgroup()
@@ -253,11 +240,29 @@ public class LTRStandardDecoderState extends DecoderState
return mTalkgroup; return mTalkgroup;
} }
private void setTalkgroup(String talkgroup)
{
if(!StringUtils.isEqual(mTalkgroup, talkgroup))
{
mTalkgroup = talkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mTalkgroup, mTalkgroupAlias));
}
}
public Alias getTalkgroupAlias() public Alias getTalkgroupAlias()
{ {
return mTalkgroupAlias; return mTalkgroupAlias;
} }
private void setTalkgroupAlias(Alias alias)
{
if(mTalkgroupAlias == null || (alias != null && mTalkgroupAlias != alias))
{
mTalkgroupAlias = alias;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mTalkgroup, mTalkgroupAlias));
}
}
public boolean hasChannelNumber() public boolean hasChannelNumber()
{ {
return mLCNTracker.getCurrentChannel() != 0; return mLCNTracker.getCurrentChannel() != 0;
@@ -268,6 +273,19 @@ public class LTRStandardDecoderState extends DecoderState
return mLCNTracker.getCurrentChannel(); return mLCNTracker.getCurrentChannel();
} }
private void setChannelNumber(int channel)
{
int original = mLCNTracker.getCurrentChannel();
mLCNTracker.processCallChannel(channel);
if(mLCNTracker.getCurrentChannel() != original)
{
broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_FREQUENCY_LABEL,
"LCN:" + mLCNTracker.getCurrentChannel()));
}
}
@Override @Override
public void init() public void init()
{ {
@@ -452,8 +470,6 @@ public class LTRStandardDecoderState extends DecoderState
{ {
mCallHighestCount = mCallLCNCounts[channel]; mCallHighestCount = mCallLCNCounts[channel];
mCurrentLCN = channel; mCurrentLCN = channel;
broadcast( Attribute.CHANNEL_NUMBER );
} }
} }
} }

View File

@@ -1,183 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.mdc1200;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class MDCDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private static final String sPROTOCOL = "MDC-1200";
private JLabel mFromLabel = new JLabel(" ");
private JLabel mFrom = new JLabel();
private JLabel mFromAlias = new JLabel();
private JLabel mToLabel = new JLabel(" ");
private JLabel mTo = new JLabel();
private JLabel mToAlias = new JLabel();
private JLabel mProtocol = new JLabel(sPROTOCOL);
private JLabel mMessage = new JLabel();
private JLabel mMessageType = new JLabel();
public MDCDecoderPanel(IconManager iconManager, SettingsManager settingsManager, MDCDecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public MDCDecoderState getDecoderState()
{
return (MDCDecoderState) super.getDecoderState();
}
protected void init()
{
/* Calling super init will get and broadcast color settings to properly
* setup the jlabel colors */
super.init();
setLayout(new MigLayout("insets 1 0 0 0", "[grow,fill]", "[]0[]0[]"));
add(mFromLabel);
add(mFrom);
add(mFromAlias, "wrap");
add(mToLabel);
add(mTo);
add(mToAlias, "wrap");
add(mProtocol);
add(mMessageType);
add(mMessage, "wrap");
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case FROM_TALKGROUP:
String from = getDecoderState().getFrom();
if(from != null)
{
mFromLabel.setText("FM:");
}
else
{
mFromLabel.setText(" ");
}
mFrom.setText(from);
break;
case FROM_TALKGROUP_ALIAS:
Alias fromAlias = getDecoderState().getFromAlias();
if(fromAlias != null)
{
mFromAlias.setText(fromAlias.getName());
}
else
{
mFromAlias.setText(null);
}
break;
case TO_TALKGROUP:
String to = getDecoderState().getTo();
if(to != null)
{
mToLabel.setText("TO:");
}
else
{
mToLabel.setText(" ");
}
mTo.setText(to);
break;
case TO_TALKGROUP_ALIAS:
Alias toAlias = getDecoderState().getToAlias();
if(toAlias != null)
{
mToAlias.setText(toAlias.getName());
}
else
{
mToAlias.setText(null);
}
break;
case MESSAGE:
mMessage.setText(getDecoderState().getMessage());
break;
case MESSAGE_TYPE:
mMessageType.setText(getDecoderState().getMessageType());
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting color = (ColorSetting) setting;
if(color.getColorSettingName() ==
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER)
{
mFromLabel.setForeground(color.getColor());
mFrom.setForeground(color.getColor());
mFromAlias.setForeground(color.getColor());
mToLabel.setForeground(color.getColor());
mTo.setForeground(color.getColor());
mToAlias.setForeground(color.getColor());
mProtocol.setForeground(color.getColor());
mMessageType.setForeground(color.getColor());
mMessage.setForeground(color.getColor());
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014,2015 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,23 +14,26 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.mdc1200; package module.decode.mdc1200;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import message.Message;
import module.decode.DecoderType;
import util.StringUtils;
import java.util.Iterator; import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import module.decode.DecoderType;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.State;
import channel.state.DecoderStateEvent.Event;
import alias.Alias;
import alias.AliasList;
public class MDCDecoderState extends DecoderState public class MDCDecoderState extends DecoderState
{ {
private TreeSet<String> mIdents = new TreeSet<String>(); private TreeSet<String> mIdents = new TreeSet<String>();
@@ -75,12 +78,12 @@ public class MDCDecoderState extends DecoderState
private void resetState() private void resetState()
{ {
setFrom( null ); mFrom = null;
setFromAlias( null ); mFromAlias = null;
setTo( null); mTo = null;
setToAlias( null ); mToAlias = null;
setMessage( null ); mMessage = null;
setMessageType( null ); mMessageType = null;
} }
@Override @Override
@@ -148,9 +151,12 @@ public class MDCDecoderState extends DecoderState
} }
public void setFrom(String from) public void setFrom(String from)
{
if(!StringUtils.isEqual(mFrom, from))
{ {
mFrom = from; mFrom = from;
broadcast( Attribute.FROM_TALKGROUP ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, mFrom, mFromAlias));
}
} }
public Alias getFromAlias() public Alias getFromAlias()
@@ -159,9 +165,12 @@ public class MDCDecoderState extends DecoderState
} }
public void setFromAlias(Alias alias) public void setFromAlias(Alias alias)
{
if(mFromAlias == null || (alias != null && mFromAlias != alias))
{ {
mFromAlias = alias; mFromAlias = alias;
broadcast( Attribute.FROM_TALKGROUP_ALIAS ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, mFrom, mFromAlias));
}
} }
public String getTo() public String getTo()
@@ -170,9 +179,12 @@ public class MDCDecoderState extends DecoderState
} }
public void setTo(String to) public void setTo(String to)
{
if(!StringUtils.isEqual(mTo, to))
{ {
mTo = to; mTo = to;
broadcast( Attribute.TO_TALKGROUP ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mTo, mToAlias));
}
} }
public Alias getToAlias() public Alias getToAlias()
@@ -181,9 +193,12 @@ public class MDCDecoderState extends DecoderState
} }
public void setToAlias(Alias alias) public void setToAlias(Alias alias)
{
if(mToAlias == null || (alias != null && mToAlias != alias))
{ {
mToAlias = alias; mToAlias = alias;
broadcast( Attribute.TO_TALKGROUP_ALIAS ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, mTo, mToAlias));
}
} }
public String getMessage() public String getMessage()
@@ -192,9 +207,12 @@ public class MDCDecoderState extends DecoderState
} }
public void setMessage(String message) public void setMessage(String message)
{
if(!StringUtils.isEqual(mMessage, message))
{ {
mMessage = message; mMessage = message;
broadcast( Attribute.MESSAGE ); broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE, mMessage));
}
} }
public String getMessageType() public String getMessageType()
@@ -203,9 +221,12 @@ public class MDCDecoderState extends DecoderState
} }
public void setMessageType(String type) public void setMessageType(String type)
{
if(!StringUtils.isEqual(mMessageType, type))
{ {
mMessageType = type; mMessageType = type;
broadcast( Attribute.MESSAGE_TYPE ); broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE_TYPE, "MDC:" + mMessageType));
}
} }
@Override @Override

View File

@@ -1,200 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.mpt1327;
import controller.channel.Channel.ChannelType;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class MPT1327DecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("");
private JLabel mSiteOrToTalkgroup = new JLabel("");
private JLabel mSiteOrToTalkgroupAlias = new JLabel("");
private JLabel mFromTalkgroupLabel = new JLabel("");
private JLabel mFromTalkgroup = new JLabel("");
private JLabel mFromTalkgroupAliasLabel = new JLabel("");
public MPT1327DecoderPanel(IconManager iconManager, SettingsManager settingsManager, MPT1327DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public MPT1327DecoderState getDecoderState()
{
return (MPT1327DecoderState) super.getDecoderState();
}
public void dispose()
{
super.dispose();
}
public void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setText("MPT1327");
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
MPT1327DecoderState mptState = getDecoderState();
mSiteOrToTalkgroup.setFont(mFontDecoder);
mSiteOrToTalkgroup.setForeground(mColorLabelDecoder);
mSiteOrToTalkgroupAlias.setFont(mFontDecoder);
mSiteOrToTalkgroupAlias.setForeground(mColorLabelDecoder);
mFromTalkgroupLabel.setFont(mFontDetails);
mFromTalkgroupLabel.setForeground(mColorLabelDetails);
mFromTalkgroup.setFont(mFontDecoder);
mFromTalkgroup.setForeground(mColorLabelDecoder);
mFromTalkgroupAliasLabel.setFont(mFontDecoder);
mFromTalkgroupAliasLabel.setForeground(mColorLabelDecoder);
switch(mptState.getChannelType())
{
case STANDARD:
mSiteOrToTalkgroup.setText(mptState.getSite());
setAliasLabel(mSiteOrToTalkgroupAlias, mptState.getSiteAlias());
break;
case TRAFFIC:
mSiteOrToTalkgroup.setText(mptState.getToTalkgroup());
setAliasLabel(mSiteOrToTalkgroupAlias, mptState.getToTalkgroupAlias());
mFromTalkgroupLabel.setText("From:");
mFromTalkgroup.setText(getDecoderState().getFromTalkgroup());
setAliasLabel(mFromTalkgroupAliasLabel, mptState.getFromTalkgroupAlias());
break;
default:
throw new IllegalArgumentException("Unrecognized channel "
+ "type in MPT1327 Decoder [" + getDecoderState()
.getChannelType().name() + "]");
}
add(mProtocol);
add(mSiteOrToTalkgroup);
add(mSiteOrToTalkgroupAlias, "wrap");
if(mptState.getChannelType() == ChannelType.TRAFFIC)
{
add(mFromTalkgroupLabel);
add(mFromTalkgroup);
add(mFromTalkgroupAliasLabel, "wrap");
}
}
@Override
public void receive(final Attribute attribute)
{
final MPT1327DecoderState state = getDecoderState();
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case CHANNEL_SITE_NUMBER:
mSiteOrToTalkgroup.setText(String.valueOf(state.getSite()));
setAliasLabel(mSiteOrToTalkgroupAlias, state.getSiteAlias(), false);
repaint();
break;
case TO_TALKGROUP:
mSiteOrToTalkgroup.setText(state.getToTalkgroup());
setAliasLabel(mSiteOrToTalkgroupAlias, state.getToTalkgroupAlias());
repaint();
break;
case FROM_TALKGROUP:
mFromTalkgroup.setText(state.getFromTalkgroup());
setAliasLabel(mFromTalkgroupAliasLabel, state.getFromTalkgroupAlias());
repaint();
break;
default:
break;
}
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
if(mProtocol != null)
{
mProtocol.setForeground(mColorLabelDecoder);
}
if(mSiteOrToTalkgroup != null)
{
mSiteOrToTalkgroup.setForeground(mColorLabelDecoder);
}
if(mSiteOrToTalkgroupAlias != null)
{
mSiteOrToTalkgroupAlias.setForeground(mColorLabelDecoder);
}
if(mFromTalkgroup != null)
{
mFromTalkgroup.setForeground(mColorLabelDecoder);
}
if(mFromTalkgroupAliasLabel != null)
{
mFromTalkgroupAliasLabel.setForeground(mColorLabelDecoder);
}
break;
case CHANNEL_STATE_LABEL_DETAILS:
if(mFromTalkgroupLabel != null)
{
mFromTalkgroupLabel.setForeground(mColorLabelDetails);
}
break;
default:
break;
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,32 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.mpt1327; package module.decode.mpt1327;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.ChangeChannelTimeoutEvent;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import channel.traffic.TrafficChannelAllocationEvent;
import controller.channel.Channel.ChannelType;
import controller.channel.map.ChannelMap;
import message.Message;
import module.decode.DecoderType;
import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import module.decode.mpt1327.MPT1327Message.IdentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@@ -25,30 +48,6 @@ import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import module.decode.DecoderType;
import module.decode.config.DecodeConfiguration;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import module.decode.mpt1327.MPT1327Message.IdentType;
import channel.state.ChangeChannelTimeoutEvent;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import channel.traffic.TrafficChannelAllocationEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.channel.Channel.ChannelType;
import controller.channel.map.ChannelMap;
public class MPT1327DecoderState extends DecoderState public class MPT1327DecoderState extends DecoderState
{ {
private final static Logger mLog = LoggerFactory.getLogger(MPT1327DecoderState.class); private final static Logger mLog = LoggerFactory.getLogger(MPT1327DecoderState.class);
@@ -67,10 +66,7 @@ public class MPT1327DecoderState extends DecoderState
private long mFrequency = 0; private long mFrequency = 0;
private long mCallTimeout; private long mCallTimeout;
public MPT1327DecoderState( AliasList aliasList, public MPT1327DecoderState(AliasList aliasList, ChannelMap channelMap, ChannelType channelType, long callTimeout)
ChannelMap channelMap,
ChannelType channelType,
long callTimeout )
{ {
super(aliasList); super(aliasList);
@@ -179,15 +175,7 @@ public class MPT1327DecoderState extends DecoderState
broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.CONTROL)); broadcast(new DecoderStateEvent(this, Event.CONTINUATION, State.CONTROL));
break; break;
case ALH: case ALH:
String site = mpt.getSiteID(); setSite(mpt.getSiteID());
if( site != null && ( mSite == null || !site.contentEquals( mSite ) ) )
{
mSite = site;
broadcast( Attribute.CHANNEL_SITE_NUMBER );
}
mSite = mpt.getSiteID();
broadcast(new DecoderStateEvent(this, Event.START, State.CONTROL)); broadcast(new DecoderStateEvent(this, Event.START, State.CONTROL));
break; break;
case GTC: case GTC:
@@ -289,12 +277,9 @@ public class MPT1327DecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
} }
broadcast(new Metadata(MetadataType.TO, setToTalkgroup(mpt.getToID());
mpt.getToID(), mpt.getToIDAlias(), true));
broadcast(new DecoderStateEvent(this, Event.START, State.CALL)); broadcast(new DecoderStateEvent(this, Event.START, State.CALL));
setToTalkgroup( mpt.getToID() );
} }
break; break;
default: default:
@@ -314,10 +299,7 @@ public class MPT1327DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mFromTalkgroup = null; mFromTalkgroup = null;
broadcast( Attribute.FROM_TALKGROUP );
mToTalkgroup = null; mToTalkgroup = null;
broadcast( Attribute.TO_TALKGROUP );
/** /**
* If this is a standard channel, reset the fade timeout to the default * If this is a standard channel, reset the fade timeout to the default
@@ -344,6 +326,19 @@ public class MPT1327DecoderState extends DecoderState
return mSite; return mSite;
} }
/**
* Set the site number.
*/
public void setSite(String site)
{
if(!StringUtils.isEqual(mSite, site))
{
mSite = site;
broadcast(new AttributeChangeRequest<String>(Attribute.NETWORK_ID_1, "SITE:" + getSite(),
getSiteAlias()));
}
}
public Alias getSiteAlias() public Alias getSiteAlias()
{ {
if(hasAliasList()) if(hasAliasList())
@@ -375,10 +370,13 @@ public class MPT1327DecoderState extends DecoderState
* channel being created. * channel being created.
*/ */
public void setFromTalkgroup(String fromTalkgroup) public void setFromTalkgroup(String fromTalkgroup)
{
if(!StringUtils.isEqual(mFromTalkgroup, fromTalkgroup))
{ {
mFromTalkgroup = fromTalkgroup; mFromTalkgroup = fromTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
broadcast( Attribute.FROM_TALKGROUP ); getFromTalkgroupAlias()));
}
} }
public Alias getFromTalkgroupAlias() public Alias getFromTalkgroupAlias()
@@ -402,10 +400,13 @@ public class MPT1327DecoderState extends DecoderState
* channel being created. * channel being created.
*/ */
public void setToTalkgroup(String toTalkgroup) public void setToTalkgroup(String toTalkgroup)
{
if(!StringUtils.isEqual(mToTalkgroup, toTalkgroup))
{ {
mToTalkgroup = toTalkgroup; mToTalkgroup = toTalkgroup;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup,
broadcast( Attribute.TO_TALKGROUP ); getToTalkgroupAlias()));
}
} }
public Alias getToTalkgroupAlias() public Alias getToTalkgroupAlias()
@@ -423,16 +424,19 @@ public class MPT1327DecoderState extends DecoderState
{ {
return mChannelNumber; return mChannelNumber;
} }
/** /**
* Set the channel number. This is used primarily for traffic channels since * Set the channel number. This is used primarily for traffic channels since
* the channel will already have been identified prior to the traffic * the channel will already have been identified prior to the traffic
* channel being created. * channel being created.
*/ */
public void setChannelNumber(int channel) public void setChannelNumber(int channel)
{
if(mChannelNumber != channel)
{ {
mChannelNumber = channel; mChannelNumber = channel;
broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_FREQUENCY_LABEL, String.valueOf(mChannelNumber)));
broadcast( Attribute.CHANNEL_NUMBER ); }
} }
@Override @Override
@@ -574,6 +578,7 @@ public class MPT1327DecoderState extends DecoderState
break; break;
case SOURCE_FREQUENCY: case SOURCE_FREQUENCY:
mFrequency = event.getFrequency(); mFrequency = event.getFrequency();
broadcast(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY, event.getFrequency()));
break; break;
case TRAFFIC_CHANNEL_ALLOCATION: case TRAFFIC_CHANNEL_ALLOCATION:
if(event.getSource() != MPT1327DecoderState.this) if(event.getSource() != MPT1327DecoderState.this)
@@ -589,8 +594,7 @@ public class MPT1327DecoderState extends DecoderState
{ {
try try
{ {
mChannelNumber = Integer.valueOf( channel ); setChannelNumber(Integer.valueOf(channel));
broadcast( Attribute.CHANNEL_NUMBER );
} }
catch(Exception e) catch(Exception e)
{ {
@@ -599,13 +603,11 @@ public class MPT1327DecoderState extends DecoderState
} }
mFrequency = allocationEvent.getCallEvent().getFrequency(); mFrequency = allocationEvent.getCallEvent().getFrequency();
broadcast( Attribute.SOURCE ); broadcast(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY,
allocationEvent.getCallEvent().getFrequency()));
mFromTalkgroup = allocationEvent.getCallEvent().getFromID(); setFromTalkgroup(allocationEvent.getCallEvent().getFromID());
broadcast( Attribute.FROM_TALKGROUP ); setToTalkgroup(allocationEvent.getCallEvent().getToID());
mToTalkgroup = allocationEvent.getCallEvent().getToID();
broadcast( Attribute.TO_TALKGROUP );
} }
} }
break; break;

View File

@@ -1,179 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.mpt1327;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class MPT1327TrafficPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocolLabel;
private JLabel mFromTalkgroupLabel;
private JLabel mFromTalkgroupAliasLabel;
private JLabel mToLabel;
private JLabel mToTalkgroupLabel;
private JLabel mToTalkgroupAliasLabel;
public MPT1327TrafficPanel(IconManager iconManager, SettingsManager settingsManager,
MPT1327DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public MPT1327DecoderState getDecoderState()
{
return (MPT1327DecoderState) super.getDecoderState();
}
public void dispose()
{
super.dispose();
}
public void init()
{
mProtocolLabel = new JLabel("MPT1327");
mProtocolLabel.setFont(mFontDecoder);
mProtocolLabel.setForeground(mColorLabelDecoder);
mFromTalkgroupLabel = new JLabel();
mFromTalkgroupLabel.setFont(mFontDecoder);
mFromTalkgroupLabel.setForeground(mColorLabelDecoder);
mFromTalkgroupAliasLabel = new JLabel();
mFromTalkgroupAliasLabel.setFont(mFontDecoder);
mFromTalkgroupAliasLabel.setForeground(mColorLabelDecoder);
mToLabel = new JLabel("TO:");
mToLabel.setFont(mFontDetails);
mToLabel.setForeground(mColorLabelDetails);
mToTalkgroupLabel = new JLabel(getDecoderState().getFromTalkgroup());
mToTalkgroupLabel.setFont(mFontDecoder);
mToTalkgroupLabel.setForeground(mColorLabelDecoder);
mToTalkgroupAliasLabel = new JLabel();
mToTalkgroupAliasLabel.setFont(mFontDecoder);
mToTalkgroupAliasLabel.setForeground(mColorLabelDecoder);
add(mProtocolLabel);
add(mFromTalkgroupLabel);
add(mFromTalkgroupAliasLabel, "wrap");
add(mToLabel);
add(mToTalkgroupLabel);
add(mToTalkgroupAliasLabel, "wrap");
}
@Override
public void receive(final Attribute attribute)
{
final MPT1327DecoderState state = getDecoderState();
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case FROM_TALKGROUP:
String talkgroup = state.getFromTalkgroup();
mFromTalkgroupLabel.setText(talkgroup);
Alias alias = state.getFromTalkgroupAlias();
if(alias != null)
{
mFromTalkgroupAliasLabel.setText(alias.getName());
String icon = alias.getIconName();
mFromTalkgroupAliasLabel.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
break;
case TO_TALKGROUP:
String toTalkgroup = state.getToTalkgroup();
mToTalkgroupLabel.setText(toTalkgroup);
Alias toAlias = state.getToTalkgroupAlias();
if(toAlias != null)
{
mToTalkgroupAliasLabel.setText(toAlias.getName());
String icon = toAlias.getIconName();
if(icon != null)
{
mToTalkgroupAliasLabel.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
}
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
mProtocolLabel.setForeground(mColorLabelDecoder);
mFromTalkgroupLabel.setForeground(mColorLabelDecoder);
mFromTalkgroupAliasLabel.setForeground(mColorLabelDecoder);
mToTalkgroupLabel.setForeground(mColorLabelDecoder);
mToTalkgroupAliasLabel.setForeground(mColorLabelDecoder);
break;
case CHANNEL_STATE_LABEL_DETAILS:
mToLabel.setForeground(mColorLabelDetails);
break;
default:
break;
}
}
}
}

View File

@@ -1,80 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.nbfm;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import channel.state.DecoderState;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
public class NBFMDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("NBFM");
public NBFMDecoderPanel(IconManager iconManager, SettingsManager settingsManager, DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
protected void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
add(mProtocol, "wrap");
}
@Override
public void receive(Attribute t)
{
/* Not implemented */
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting color = (ColorSetting) setting;
if(color.getColorSettingName() ==
ColorSettingName.CHANNEL_STATE_LABEL_DECODER)
{
mProtocol.setForeground(color.getColor());
}
}
}
}

View File

@@ -1,226 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.p25;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class P25DecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol;
private JLabel mTo = new JLabel(" ");
private JLabel mToAlias = new JLabel(" ");
private JLabel mNAC = new JLabel("NAC:");
private JLabel mFrom = new JLabel(" ");
private JLabel mFromAlias = new JLabel(" ");
private JLabel mSystem = new JLabel("SYS:");
private JLabel mSite = new JLabel("Site:");
private JLabel mSiteAlias = new JLabel("");
public P25DecoderPanel(IconManager iconManager, SettingsManager settingsManager, P25DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
mProtocol = new JLabel("P25-1 " + decoderState.getModulation().getShortLabel());
init();
}
public void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
mTo.setFont(mFontDecoder);
mTo.setForeground(mColorLabelDecoder);
mToAlias.setFont(mFontDecoder);
mToAlias.setForeground(mColorLabelDecoder);
mNAC.setFont(mFontDetails);
mNAC.setForeground(mColorLabelDecoder);
mFrom.setFont(mFontDecoder);
mFrom.setForeground(mColorLabelDecoder);
mFromAlias.setFont(mFontDecoder);
mFromAlias.setForeground(mColorLabelDecoder);
mSystem.setFont(mFontDetails);
mSystem.setForeground(mColorLabelDecoder);
mSiteAlias.setFont(mFontDecoder);
mSiteAlias.setForeground(mColorLabelDecoder);
mSite.setFont(mFontDetails);
mSite.setForeground(mColorLabelDecoder);
add(mProtocol);
add(mTo);
add(mToAlias, "wrap");
add(mNAC);
add(mFrom);
add(mFromAlias, "wrap");
add(mSystem);
add(mSite);
add(mSiteAlias, "wrap");
}
public P25DecoderState getDecoderState()
{
return (P25DecoderState) super.getDecoderState();
}
@Override
public void receive(final Attribute attribute)
{
final P25DecoderState state = getDecoderState();
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case NAC:
mNAC.setText("NAC:" + state.getNAC());
break;
case SYSTEM:
mSystem.setText("SYS:" + state.getSystem());
break;
case SITE:
mSite.setText("SITE:" + state.getSite());
break;
case SITE_ALIAS:
mSiteAlias.setText(state.getSiteAlias());
break;
case FROM_TALKGROUP:
if(state.getFromTalkgroup() == null)
{
mFrom.setText(" ");
}
else
{
mFrom.setText(state.getFromTalkgroup());
}
break;
case FROM_TALKGROUP_ALIAS:
Alias from = state.getFromAlias();
if(from != null)
{
mFromAlias.setText(from.getName());
final String icon = from.getIconName();
if(icon != null && mIconManager != null)
{
mFromAlias.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
}
else
{
mFromAlias.setText(" ");
mFromAlias.setIcon(null);
}
break;
case TO_TALKGROUP:
if(state.getToTalkgroup() == null)
{
mTo.setText(" ");
}
else
{
mTo.setText(state.getToTalkgroup());
}
break;
case TO_TALKGROUP_ALIAS:
final Alias to = state.getToAlias();
if(to != null)
{
mToAlias.setText(to.getName());
final String icon = to.getIconName();
if(icon != null && mIconManager != null)
{
mToAlias.setIcon(mIconManager.getIcon(icon, IconManager.DEFAULT_ICON_SIZE));
}
}
else
{
mToAlias.setText(" ");
mToAlias.setIcon(null);
}
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
if(mProtocol != null)
{
mProtocol.setForeground(mColorLabelDecoder);
}
break;
default:
break;
}
}
}
}

View File

@@ -21,8 +21,14 @@ import alias.Alias;
import alias.AliasList; import alias.AliasList;
import alias.PatchGroupAlias; import alias.PatchGroupAlias;
import alias.id.talkgroup.TalkgroupID; import alias.id.talkgroup.TalkgroupID;
import audio.metadata.Metadata; import channel.metadata.Attribute;
import audio.metadata.MetadataType; import channel.metadata.AttributeChangeRequest;
import channel.state.ChangeChannelTimeoutEvent;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import channel.traffic.TrafficChannelAllocationEvent;
import controller.channel.Channel.ChannelType; import controller.channel.Channel.ChannelType;
import message.Message; import message.Message;
import module.decode.DecoderType; import module.decode.DecoderType;
@@ -123,13 +129,6 @@ import module.decode.p25.reference.IPProtocol;
import module.decode.p25.reference.LinkControlOpcode; import module.decode.p25.reference.LinkControlOpcode;
import module.decode.p25.reference.Response; import module.decode.p25.reference.Response;
import module.decode.p25.reference.Vendor; import module.decode.p25.reference.Vendor;
import channel.state.ChangeChannelTimeoutEvent;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import channel.traffic.TrafficChannelAllocationEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -225,9 +224,10 @@ public class P25DecoderState extends DecoderState
{ {
resetState(); resetState();
updateNAC(null); mNAC = null;
updateSite(null); mSite = null;
updateSystem(null); mSiteAlias = null;
mSystem = null;
} }
/** /**
@@ -236,16 +236,9 @@ public class P25DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
mFromTalkgroup = null; mFromTalkgroup = null;
broadcast(Attribute.FROM_TALKGROUP);
mFromAlias = null; mFromAlias = null;
broadcast(Attribute.FROM_TALKGROUP_ALIAS);
mToTalkgroup = null; mToTalkgroup = null;
broadcast(Attribute.TO_TALKGROUP);
mToAlias = null; mToAlias = null;
broadcast(Attribute.TO_TALKGROUP_ALIAS);
mCallDetectTalkgroups.clear(); mCallDetectTalkgroups.clear();
@@ -3372,8 +3365,6 @@ public class P25DecoderState extends DecoderState
{ {
mToTalkgroup = to; mToTalkgroup = to;
broadcast(Attribute.TO_TALKGROUP);
if(hasAliasList()) if(hasAliasList())
{ {
mToAlias = getAliasList().getTalkgroupAlias(mToTalkgroup); mToAlias = getAliasList().getTalkgroupAlias(mToTalkgroup);
@@ -3383,14 +3374,10 @@ public class P25DecoderState extends DecoderState
mToAlias = null; mToAlias = null;
} }
broadcast(Attribute.TO_TALKGROUP_ALIAS); broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup, mToAlias));
/* Send audio metadata update */
broadcast(new Metadata(MetadataType.TO, mToTalkgroup, mToAlias, true));
if(mCurrentCallEvent != null && if(mCurrentCallEvent != null &&
(mCurrentCallEvent.getToID() == null || (mCurrentCallEvent.getToID() == null || !mCurrentCallEvent.getToID().contentEquals(to)))
!mCurrentCallEvent.getToID().contentEquals(to)))
{ {
mCurrentCallEvent.setToID(to); mCurrentCallEvent.setToID(to);
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
@@ -3409,7 +3396,6 @@ public class P25DecoderState extends DecoderState
if(mFromTalkgroup == null || !mFromTalkgroup.contentEquals(from)) if(mFromTalkgroup == null || !mFromTalkgroup.contentEquals(from))
{ {
mFromTalkgroup = from; mFromTalkgroup = from;
broadcast(Attribute.FROM_TALKGROUP);
if(hasAliasList()) if(hasAliasList())
{ {
@@ -3420,14 +3406,11 @@ public class P25DecoderState extends DecoderState
mFromAlias = null; mFromAlias = null;
} }
broadcast(Attribute.FROM_TALKGROUP_ALIAS); broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup,
mFromAlias));
/* Send audio metadata update */
broadcast(new Metadata(MetadataType.FROM, mFromTalkgroup, mFromAlias, true));
if(mCurrentCallEvent != null && if(mCurrentCallEvent != null &&
(mCurrentCallEvent.getFromID() == null || (mCurrentCallEvent.getFromID() == null || !mCurrentCallEvent.getFromID().contentEquals(from)))
!mCurrentCallEvent.getFromID().contentEquals(from)))
{ {
mCurrentCallEvent.setFromID(from); mCurrentCallEvent.setFromID(from);
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
@@ -3437,19 +3420,6 @@ public class P25DecoderState extends DecoderState
} }
} }
/**
* Broadcasts an update to the NAC
*/
private void updateNAC(String nac)
{
if(mNAC == null || (nac != null && !mNAC.contentEquals(nac)))
{
mNAC = nac;
broadcast(Attribute.NAC);
}
}
/** /**
* Updates the site information * Updates the site information
*/ */
@@ -3459,8 +3429,6 @@ public class P25DecoderState extends DecoderState
{ {
mSite = site; mSite = site;
broadcast(Attribute.SITE);
if(hasAliasList()) if(hasAliasList())
{ {
Alias alias = getAliasList().getSiteID(mSite); Alias alias = getAliasList().getSiteID(mSite);
@@ -3475,7 +3443,7 @@ public class P25DecoderState extends DecoderState
} }
} }
broadcast(Attribute.SITE_ALIAS);
} }
} }
@@ -3484,11 +3452,28 @@ public class P25DecoderState extends DecoderState
if(mSystem == null || (system != null && !mSystem.contentEquals(system))) if(mSystem == null || (system != null && !mSystem.contentEquals(system)))
{ {
mSystem = system; mSystem = system;
broadcastSystemAndNACUpdate();
broadcast(Attribute.SYSTEM);
} }
} }
/**
* Broadcasts an update to the NAC
*/
private void updateNAC(String nac)
{
if(mNAC == null || (nac != null && !mNAC.contentEquals(nac)))
{
mNAC = nac;
broadcastSystemAndNACUpdate();
}
}
private void broadcastSystemAndNACUpdate()
{
String label = String.format("SYS:%s NAC:%s", mSystem, mNAC);
broadcast(new AttributeChangeRequest<String>(Attribute.NETWORK_ID_1, label));
}
/** /**
* Process a unit paging event message * Process a unit paging event message
*/ */
@@ -3816,27 +3801,24 @@ public class P25DecoderState extends DecoderState
mCurrentCallEvent = (P25CallEvent) allocationEvent.getCallEvent(); mCurrentCallEvent = (P25CallEvent) allocationEvent.getCallEvent();
mCurrentChannel = allocationEvent.getCallEvent().getChannel(); mCurrentChannel = allocationEvent.getCallEvent().getChannel();
broadcast(Attribute.CHANNEL_NUMBER); broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_FREQUENCY_LABEL, mCurrentChannel));
mCurrentChannelFrequency = allocationEvent.getCallEvent().getFrequency(); mCurrentChannelFrequency = allocationEvent.getCallEvent().getFrequency();
broadcast(Attribute.SOURCE); broadcast(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY, mCurrentChannelFrequency));
mFromTalkgroup = allocationEvent.getCallEvent().getFromID(); mFromTalkgroup = allocationEvent.getCallEvent().getFromID();
broadcast(Attribute.FROM_TALKGROUP);
mToTalkgroup = allocationEvent.getCallEvent().getToID(); mToTalkgroup = allocationEvent.getCallEvent().getToID();
broadcast(Attribute.TO_TALKGROUP);
if(allocationEvent.getCallEvent().hasAliasList()) if(allocationEvent.getCallEvent().hasAliasList())
{ {
AliasList aliasList = allocationEvent.getCallEvent().getAliasList(); AliasList aliasList = allocationEvent.getCallEvent().getAliasList();
mFromAlias = aliasList.getTalkgroupAlias(mFromTalkgroup); mFromAlias = aliasList.getTalkgroupAlias(mFromTalkgroup);
broadcast(Attribute.FROM_TALKGROUP_ALIAS);
mToAlias = aliasList.getTalkgroupAlias(mToTalkgroup); mToAlias = aliasList.getTalkgroupAlias(mToTalkgroup);
broadcast(Attribute.TO_TALKGROUP_ALIAS);
} }
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, mFromTalkgroup, mFromAlias));
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, mToTalkgroup, mToAlias));
} }
} }
break; break;

View File

@@ -1,56 +1,42 @@
package module.decode.p25.audio; package module.decode.p25.audio;
import java.util.concurrent.ScheduledExecutorService; import audio.AudioFormats;
import audio.AudioPacket;
import audio.IAudioPacketProvider;
import audio.squelch.ISquelchStateListener;
import audio.squelch.SquelchState;
import channel.metadata.Metadata;
import dsp.gain.NonClippingGain;
import jmbe.iface.AudioConversionLibrary; import jmbe.iface.AudioConversionLibrary;
import jmbe.iface.AudioConverter; import jmbe.iface.AudioConverter;
import message.IMessageListener; import message.IMessageListener;
import message.Message; import message.Message;
import module.Module; import module.Module;
import module.decode.p25.message.ldu.LDUMessage; import module.decode.p25.message.ldu.LDUMessage;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sample.Listener; import sample.Listener;
import audio.AudioFormats;
import audio.AudioPacket;
import audio.IAudioPacketProvider;
import audio.metadata.AudioMetadata;
import audio.metadata.IMetadataListener;
import audio.metadata.Metadata;
import audio.squelch.ISquelchStateListener;
import audio.squelch.SquelchState;
import controller.channel.ChannelEvent;
import controller.channel.IChannelEventListener;
import dsp.gain.NonClippingGain;
public class P25AudioModule extends Module implements Listener<Message>, import java.util.concurrent.ScheduledExecutorService;
IAudioPacketProvider, IMessageListener, IChannelEventListener,
IMetadataListener, ISquelchStateListener public class P25AudioModule extends Module implements Listener<Message>, IAudioPacketProvider, IMessageListener,
ISquelchStateListener
{ {
private final static Logger mLog = LoggerFactory.getLogger(P25AudioModule.class); private final static Logger mLog = LoggerFactory.getLogger(P25AudioModule.class);
private static final String IMBE_CODEC = "IMBE"; private static final String IMBE_CODEC = "IMBE";
/* Provides a unique identifier for this audio module instance to use as a
* source identifier for all audio packets */
private static int UNIQUE_ID = 0;
private int mSourceID;
private static boolean mLibraryLoadStatusLogged = false; private static boolean mLibraryLoadStatusLogged = false;
private boolean mCanConvertAudio = false; private boolean mCanConvertAudio = false;
private AudioConverter mAudioConverter; private AudioConverter mAudioConverter;
private Listener<AudioPacket> mAudioPacketListener; private Listener<AudioPacket> mAudioPacketListener;
private AudioMetadata mAudioMetadata;
private ChannelEventListener mChannelEventListener = new ChannelEventListener();
private SquelchStateListener mSquelchStateListener = new SquelchStateListener(); private SquelchStateListener mSquelchStateListener = new SquelchStateListener();
private NonClippingGain mGain = new NonClippingGain(5.0f, 0.95f); private NonClippingGain mGain = new NonClippingGain(5.0f, 0.95f);
private Metadata mMetadata;
public P25AudioModule(boolean record) public P25AudioModule(Metadata metadata)
{ {
mSourceID = ++UNIQUE_ID; mMetadata = metadata;
mAudioMetadata = new AudioMetadata(mSourceID, record);
loadConverter(); loadConverter();
} }
@@ -75,7 +61,6 @@ public class P25AudioModule extends Module implements Listener<Message>,
@Override @Override
public void reset() public void reset()
{ {
mAudioMetadata.reset();
} }
@Override @Override
@@ -113,8 +98,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
audio = mGain.apply(audio); audio = mGain.apply(audio);
mAudioPacketListener.receive( mAudioPacketListener.receive(new AudioPacket(audio, mMetadata.copyOf()));
new AudioPacket(audio, mAudioMetadata.copyOf()));
} }
} }
} }
@@ -211,41 +195,6 @@ public class P25AudioModule extends Module implements Listener<Message>,
mAudioPacketListener = null; mAudioPacketListener = null;
} }
@Override
public Listener<Metadata> getMetadataListener()
{
return mAudioMetadata;
}
@Override
public Listener<ChannelEvent> getChannelEventListener()
{
return mChannelEventListener;
}
/**
* Wrapper for channel event listener. Responds to channel state reset
* events to remove/cleanup current audio metadata
*/
public class ChannelEventListener implements Listener<ChannelEvent>
{
@Override
public void receive(ChannelEvent event)
{
switch (event.getEvent())
{
case NOTIFICATION_STATE_RESET:
mAudioMetadata.reset();
break;
case NOTIFICATION_SELECTION_CHANGE:
mAudioMetadata.setSelected(event.getChannel().isSelected());
break;
default:
break;
}
}
}
/** /**
* Wrapper for squelch state listener. Internally, the P25 audio module * Wrapper for squelch state listener. Internally, the P25 audio module
* doesn't have a squelch state. If there are IMBE audio frames, we have * doesn't have a squelch state. If there are IMBE audio frames, we have
@@ -259,10 +208,7 @@ public class P25AudioModule extends Module implements Listener<Message>,
{ {
if (state == SquelchState.SQUELCH && mAudioPacketListener != null) if (state == SquelchState.SQUELCH && mAudioPacketListener != null)
{ {
mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf()));
mAudioMetadata.copyOf()));
mAudioMetadata.reset();
} }
} }
} }

View File

@@ -1,225 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.passport;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class PassportDecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private JLabel mProtocol = new JLabel("Passport");
private JLabel mToTalkgroup = new JLabel();
private JLabel mToTalkgroupAlias = new JLabel();
private JLabel mSiteAndChannel = new JLabel("Site:");
private JLabel mFromTalkgroup = new JLabel();
private JLabel mFromTalkgroupAlias = new JLabel();
public PassportDecoderPanel(IconManager iconManager, SettingsManager settingsManager, PassportDecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public void dispose()
{
super.dispose();
}
public void init()
{
super.init();
setLayout(new MigLayout("insets 0 0 0 0", "[grow,fill]", "[]0[]0[]"));
mProtocol.setFont(mFontDecoder);
mProtocol.setForeground(mColorLabelDecoder);
mToTalkgroup.setFont(mFontDecoder);
mToTalkgroup.setForeground(mColorLabelDecoder);
mToTalkgroupAlias.setFont(mFontDecoder);
mToTalkgroupAlias.setForeground(mColorLabelDecoder);
mSiteAndChannel.setFont(mFontDecoder);
mSiteAndChannel.setForeground(mColorLabelDecoder);
mFromTalkgroup.setFont(mFontDecoder);
mFromTalkgroup.setForeground(mColorLabelDecoder);
mFromTalkgroupAlias.setFont(mFontDecoder);
mFromTalkgroupAlias.setForeground(mColorLabelDecoder);
add(mProtocol);
add(mToTalkgroup);
add(mToTalkgroupAlias, "wrap");
add(mSiteAndChannel);
add(mFromTalkgroup);
add(mFromTalkgroupAlias, "wrap");
}
public PassportDecoderState getDecoderState()
{
return (PassportDecoderState) super.getDecoderState();
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
PassportDecoderState state = getDecoderState();
switch(attribute)
{
case TO_TALKGROUP:
String tg = state.getTalkgroup();
if(tg != null)
{
mToTalkgroup.setText("TG:" + tg);
}
else
{
mToTalkgroup.setText(null);
}
break;
case TO_TALKGROUP_ALIAS:
Alias toAlias = state.getTalkgroupAlias();
if(toAlias != null)
{
mToTalkgroupAlias.setText(toAlias.getName());
mToTalkgroupAlias.setIcon(mIconManager.getIcon(toAlias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
}
else
{
mToTalkgroupAlias.setText(null);
mToTalkgroupAlias.setIcon(null);
}
break;
case FROM_TALKGROUP:
String mid = state.getMobileID();
if(mid != null)
{
mFromTalkgroup.setText("MIN:" + mid);
}
else
{
mFromTalkgroup.setText(null);
}
break;
case FROM_TALKGROUP_ALIAS:
Alias fromAlias = state.getMobileIDAlias();
if(fromAlias != null)
{
mFromTalkgroupAlias.setText(fromAlias.getName());
mFromTalkgroupAlias.setIcon(mIconManager
.getIcon(fromAlias.getIconName(), IconManager.DEFAULT_ICON_SIZE));
}
else
{
mFromTalkgroupAlias.setText(null);
mFromTalkgroupAlias.setIcon(null);
}
break;
case CHANNEL_NUMBER:
StringBuilder sb = new StringBuilder();
sb.append("Site: ");
sb.append(state.getSiteNumber());
sb.append("/");
sb.append(state.getChannelNumber());
mSiteAndChannel.setText(sb.toString());
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting colorSetting = (ColorSetting) setting;
switch(colorSetting.getColorSettingName())
{
case CHANNEL_STATE_LABEL_DECODER:
if(mColorLabelDecoder != null)
{
if(mProtocol != null)
{
mProtocol.setForeground(mColorLabelDecoder);
}
if(mToTalkgroup != null)
{
mToTalkgroup.setForeground(mColorLabelDecoder);
}
if(mToTalkgroupAlias != null)
{
mToTalkgroupAlias.setForeground(mColorLabelDecoder);
}
if(mSiteAndChannel != null)
{
mSiteAndChannel.setForeground(mColorLabelDecoder);
}
if(mFromTalkgroup != null)
{
mFromTalkgroup.setForeground(mColorLabelDecoder);
}
if(mFromTalkgroupAlias != null)
{
mFromTalkgroupAlias.setForeground(mColorLabelDecoder);
}
}
break;
default:
break;
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014,2015 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,9 +14,26 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.passport; package module.decode.passport;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@@ -25,24 +42,6 @@ import java.util.Iterator;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent;
import module.decode.event.CallEvent.CallEventType;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias;
import alias.AliasList;
import audio.metadata.Metadata;
import audio.metadata.MetadataType;
public class PassportDecoderState extends DecoderState public class PassportDecoderState extends DecoderState
{ {
private final static Logger mLog = private final static Logger mLog =
@@ -141,7 +140,7 @@ public class PassportDecoderState extends DecoderState
if(mChannelNumber == 0) if(mChannelNumber == 0)
{ {
mChannelNumber = passport.getLCN(); setChannelNumber(passport.getLCN());
} }
/* Call on this channel */ /* Call on this channel */
@@ -149,8 +148,6 @@ public class PassportDecoderState extends DecoderState
{ {
setTalkgroup(talkgroup); setTalkgroup(talkgroup);
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
PassportCallEvent current = getCurrentCallEvent(); PassportCallEvent current = getCurrentCallEvent();
/* If we're already in a call event, add the message /* If we're already in a call event, add the message
@@ -174,9 +171,6 @@ public class PassportDecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
broadcast( new Metadata( MetadataType.TO,
mTalkgroup, mTalkgroupAlias, true ) );
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this,
Event.START, State.CALL)); Event.START, State.CALL));
} }
@@ -215,8 +209,6 @@ public class PassportDecoderState extends DecoderState
logTalkgroup(endTalkgroup); logTalkgroup(endTalkgroup);
setTalkgroup(endTalkgroup); setTalkgroup(endTalkgroup);
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this,
Event.END, State.CALL)); Event.END, State.CALL));
@@ -240,7 +232,7 @@ public class PassportDecoderState extends DecoderState
if(mChannelNumber == 0) if(mChannelNumber == 0)
{ {
mChannelNumber = passport.getLCN(); setChannelNumber(passport.getLCN());
} }
/* Data call on this channel */ /* Data call on this channel */
@@ -248,8 +240,6 @@ public class PassportDecoderState extends DecoderState
{ {
setTalkgroup(dataTalkgroup); setTalkgroup(dataTalkgroup);
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
PassportCallEvent current = getCurrentCallEvent(); PassportCallEvent current = getCurrentCallEvent();
/* If we're already in a call event, add the message /* If we're already in a call event, add the message
@@ -273,9 +263,6 @@ public class PassportDecoderState extends DecoderState
broadcast(mCurrentCallEvent); broadcast(mCurrentCallEvent);
broadcast( new Metadata( MetadataType.TO,
mTalkgroup, mTalkgroupAlias, true ) );
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this,
Event.START, State.DATA)); Event.START, State.DATA));
} }
@@ -314,8 +301,6 @@ public class PassportDecoderState extends DecoderState
logTalkgroup(dataEndTalkgroup); logTalkgroup(dataEndTalkgroup);
setTalkgroup(dataEndTalkgroup); setTalkgroup(dataEndTalkgroup);
setTalkgroupAlias( passport.getTalkgroupIDAlias() );
broadcast(new DecoderStateEvent(this, broadcast(new DecoderStateEvent(this,
Event.END, State.DATA)); Event.END, State.DATA));
@@ -337,10 +322,6 @@ public class PassportDecoderState extends DecoderState
} }
setMobileID(min); setMobileID(min);
setMobileIDAlias( passport.getMobileIDAlias() );
broadcast( new Metadata( MetadataType.FROM,
mMobileID, mMobileIDAlias, true ) );
final CallEvent current = getCurrentCallEvent(); final CallEvent current = getCurrentCallEvent();
@@ -380,18 +361,11 @@ public class PassportDecoderState extends DecoderState
mNeighborLCNs.put(passport.getFree(), mNeighborLCNs.put(passport.getFree(),
passport.getFreeFrequencyFormatted()); passport.getFreeFrequencyFormatted());
} }
setSiteNumber(passport.getSite());
PassportBand band = passport.getSiteBand(); PassportBand band = passport.getSiteBand();
setSiteBand(band);
if( mSiteBand == null || mSiteBand != band ) setChannelNumber(getSiteBand().getChannel(mFrequency));
{
mSiteBand = band;
mSiteNumber = passport.getSite();
mChannelNumber = mSiteBand.getChannel( mFrequency );
broadcast( Attribute.CHANNEL_NUMBER );
}
break; break;
default: default:
break; break;
@@ -545,11 +519,10 @@ public class PassportDecoderState extends DecoderState
private void resetState() private void resetState()
{ {
setTalkgroup( null ); mTalkgroup = null;
setTalkgroupAlias( null ); mTalkgroupAlias = null;
mMobileID = null;
setMobileID( null ); mMobileIDAlias = null;
setMobileIDAlias( null );
} }
public int getChannelNumber() public int getChannelNumber()
@@ -557,20 +530,58 @@ public class PassportDecoderState extends DecoderState
return mChannelNumber; return mChannelNumber;
} }
private void setChannelNumber(int channel)
{
if(mChannelNumber != channel)
{
mChannelNumber = channel;
broadcast(new AttributeChangeRequest<String>(Attribute.CHANNEL_FREQUENCY_LABEL, "CHAN:" + mChannelNumber));
}
}
public int getSiteNumber() public int getSiteNumber()
{ {
return mSiteNumber; return mSiteNumber;
} }
private void setSiteNumber(int site)
{
if(mSiteNumber != site)
{
mSiteNumber = site;
Alias alias = hasAliasList() ? getAliasList().getSiteID(String.valueOf(getSiteNumber())) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.NETWORK_ID_1, "SITE:" + mSiteNumber, alias));
}
}
private PassportBand getSiteBand()
{
return mSiteBand;
}
private void setSiteBand(PassportBand band)
{
if(mSiteBand == null)
{
mSiteBand = band;
broadcast(new AttributeChangeRequest<String>(Attribute.NETWORK_ID_2, "BAND:" + band.getDescription()));
}
}
public String getTalkgroup() public String getTalkgroup()
{ {
return mTalkgroup; return mTalkgroup;
} }
public void setTalkgroup(String talkgroup) public void setTalkgroup(String talkgroup)
{
if(!StringUtils.isEqual(mTalkgroup, talkgroup))
{ {
mTalkgroup = talkgroup; mTalkgroup = talkgroup;
broadcast( Attribute.TO_TALKGROUP ); mTalkgroupAlias = hasAliasList() ? getAliasList().getTalkgroupAlias(getTalkgroup()) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_TO, getTalkgroup(),
getTalkgroupAlias()));
}
} }
public Alias getTalkgroupAlias() public Alias getTalkgroupAlias()
@@ -578,21 +589,20 @@ public class PassportDecoderState extends DecoderState
return mTalkgroupAlias; return mTalkgroupAlias;
} }
public void setTalkgroupAlias( Alias alias )
{
mTalkgroupAlias = alias;
broadcast( Attribute.TO_TALKGROUP_ALIAS );
}
public String getMobileID() public String getMobileID()
{ {
return mMobileID; return mMobileID;
} }
public void setMobileID(String id) public void setMobileID(String id)
{
if(!StringUtils.isEqual(mMobileID, id))
{ {
mMobileID = id; mMobileID = id;
broadcast( Attribute.FROM_TALKGROUP ); mMobileIDAlias = hasAliasList() ? getAliasList().getMobileIDNumberAlias(getMobileID()) : null;
broadcast(new AttributeChangeRequest<String>(Attribute.PRIMARY_ADDRESS_FROM, getMobileID(),
getMobileIDAlias()));
}
} }
public Alias getMobileIDAlias() public Alias getMobileIDAlias()
@@ -600,12 +610,6 @@ public class PassportDecoderState extends DecoderState
return mMobileIDAlias; return mMobileIDAlias;
} }
public void setMobileIDAlias( Alias alias )
{
mMobileIDAlias = alias;
broadcast( Attribute.FROM_TALKGROUP_ALIAS );
}
@Override @Override
public void receiveDecoderStateEvent(DecoderStateEvent event) public void receiveDecoderStateEvent(DecoderStateEvent event)
{ {
@@ -616,6 +620,7 @@ public class PassportDecoderState extends DecoderState
break; break;
case SOURCE_FREQUENCY: case SOURCE_FREQUENCY:
mFrequency = event.getFrequency(); mFrequency = event.getFrequency();
broadcast(new AttributeChangeRequest<Long>(Attribute.CHANNEL_FREQUENCY, mFrequency));
break; break;
default: default:
break; break;

View File

@@ -1,180 +0,0 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package module.decode.tait;
import alias.Alias;
import icon.IconManager;
import channel.metadata.Attribute;
import channel.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
import settings.SettingsManager;
import javax.swing.*;
import java.awt.*;
public class Tait1200DecoderPanel extends DecoderPanel
{
private static final long serialVersionUID = 1L;
private static final String PROTOCOL = "TAIT-1200";
private JLabel mFromLabel = new JLabel(" ");
private JLabel mFrom = new JLabel();
private JLabel mFromAlias = new JLabel();
private JLabel mToLabel = new JLabel();
private JLabel mTo = new JLabel(" ");
private JLabel mToAlias = new JLabel();
private JLabel mProtocol = new JLabel(PROTOCOL);
private JLabel mMessage = new JLabel();
private JLabel mMessageType = new JLabel();
public Tait1200DecoderPanel(IconManager iconManager, SettingsManager settingsManager, Tait1200DecoderState decoderState)
{
super(iconManager, settingsManager, decoderState);
init();
}
public void dispose()
{
super.dispose();
}
public Tait1200DecoderState getDecoderState()
{
return (Tait1200DecoderState) super.getDecoderState();
}
protected void init()
{
/* Calling super init will get and broadcast color settings to properly
* setup the jlabel colors */
super.init();
setLayout(new MigLayout("insets 1 0 0 0", "[grow,fill]", "[]0[]0[]"));
add(mFromLabel);
add(mFrom);
add(mFromAlias, "wrap");
add(mToLabel);
add(mTo);
add(mToAlias, "wrap");
add(mProtocol);
add(mMessageType);
add(mMessage, "wrap");
}
@Override
public void receive(final Attribute attribute)
{
EventQueue.invokeLater(new Runnable()
{
@Override
public void run()
{
switch(attribute)
{
case FROM_TALKGROUP:
String from = getDecoderState().getFromID();
if(from != null)
{
mFromLabel.setText("FM:");
}
else
{
mFromLabel.setText(" ");
}
mFrom.setText(from);
break;
case FROM_TALKGROUP_ALIAS:
Alias fromAlias = getDecoderState().getFromIDAlias();
if(fromAlias != null)
{
mFromAlias.setText(fromAlias.getName());
}
break;
case TO_TALKGROUP:
String to = getDecoderState().getToID();
if(to != null)
{
mToLabel.setText("TO:");
}
else
{
mToLabel.setText(" ");
}
mTo.setText(to);
break;
case TO_TALKGROUP_ALIAS:
Alias toAlias = getDecoderState().getToIDAlias();
if(toAlias != null)
{
mToAlias.setText(toAlias.getName());
}
break;
case MESSAGE:
mMessage.setText(getDecoderState().getMessage());
break;
case MESSAGE_TYPE:
mMessageType.setText(getDecoderState().getMessageType());
break;
default:
break;
}
repaint();
}
});
}
@Override
public void settingChanged(Setting setting)
{
super.settingChanged(setting);
if(setting instanceof ColorSetting)
{
ColorSetting color = (ColorSetting) setting;
if(color.getColorSettingName() ==
ColorSettingName.CHANNEL_STATE_LABEL_AUX_DECODER)
{
mFromLabel.setForeground(color.getColor());
mFrom.setForeground(color.getColor());
mFromAlias.setForeground(color.getColor());
mToLabel.setForeground(color.getColor());
mTo.setForeground(color.getColor());
mToAlias.setForeground(color.getColor());
mProtocol.setForeground(color.getColor());
mMessageType.setForeground(color.getColor());
mMessage.setForeground(color.getColor());
}
}
}
}

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* SDR Trunk * sdrtrunk
* Copyright (C) 2014,2015 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -14,28 +14,30 @@
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/ ******************************************************************************/
package module.decode.tait; package module.decode.tait;
import alias.Alias;
import alias.AliasList;
import channel.metadata.Attribute;
import channel.metadata.AttributeChangeRequest;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.DecoderStateEvent.Event;
import channel.state.State;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent.CallEventType;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import util.StringUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import message.Message;
import module.decode.DecoderType;
import module.decode.event.CallEvent.CallEventType;
import channel.metadata.Attribute;
import channel.state.DecoderState;
import channel.state.DecoderStateEvent;
import channel.state.State;
import channel.state.DecoderStateEvent.Event;
import alias.Alias;
import alias.AliasList;
public class Tait1200DecoderState extends DecoderState public class Tait1200DecoderState extends DecoderState
{ {
private TreeSet<String> mIdents = new TreeSet<String>(); private TreeSet<String> mIdents = new TreeSet<String>();
@@ -80,12 +82,12 @@ public class Tait1200DecoderState extends DecoderState
private void resetState() private void resetState()
{ {
setFromID( null ); mFrom = null;
setFromIDAlias( null ); mFromAlias = null;
setToID( null ); mTo = null;
setToIDAlias( null ); mToAlias = null;
setMessage( null ); mMessage = null;
setMessageType( null ); mMessageType = null;
} }
@Override @Override
@@ -206,9 +208,12 @@ public class Tait1200DecoderState extends DecoderState
} }
public void setFromID(String from) public void setFromID(String from)
{
if(!StringUtils.isEqual(mFrom, from))
{ {
mFrom = from; mFrom = from;
broadcast( Attribute.FROM_TALKGROUP ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, getFromID(), getFromIDAlias()));
}
} }
public Alias getFromIDAlias() public Alias getFromIDAlias()
@@ -217,9 +222,12 @@ public class Tait1200DecoderState extends DecoderState
} }
public void setFromIDAlias(Alias alias) public void setFromIDAlias(Alias alias)
{
if(mFromAlias == null || (alias != null && mFromAlias != alias))
{ {
mFromAlias = alias; mFromAlias = alias;
broadcast( Attribute.FROM_TALKGROUP_ALIAS ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_FROM, getFromID(), getFromIDAlias()));
}
} }
public String getToID() public String getToID()
@@ -228,9 +236,12 @@ public class Tait1200DecoderState extends DecoderState
} }
public void setToID(String to) public void setToID(String to)
{
if(!StringUtils.isEqual(mTo, to))
{ {
mTo = to; mTo = to;
broadcast( Attribute.TO_TALKGROUP ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, getToID(), getToIDAlias()));
}
} }
public Alias getToIDAlias() public Alias getToIDAlias()
@@ -239,9 +250,12 @@ public class Tait1200DecoderState extends DecoderState
} }
public void setToIDAlias(Alias alias) public void setToIDAlias(Alias alias)
{
if(mToAlias == null || (alias != null && mToAlias != alias))
{ {
mToAlias = alias; mToAlias = alias;
broadcast( Attribute.TO_TALKGROUP_ALIAS ); broadcast(new AttributeChangeRequest<String>(Attribute.SECONDARY_ADDRESS_TO, getToID(), getToIDAlias()));
}
} }
public String getMessage() public String getMessage()
@@ -250,9 +264,12 @@ public class Tait1200DecoderState extends DecoderState
} }
public void setMessage(String message) public void setMessage(String message)
{
if(!StringUtils.isEqual(mMessage, message))
{ {
mMessage = message; mMessage = message;
broadcast( Attribute.MESSAGE ); broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE, getMessage()));
}
} }
public String getMessageType() public String getMessageType()
@@ -261,8 +278,11 @@ public class Tait1200DecoderState extends DecoderState
} }
public void setMessageType(String type) public void setMessageType(String type)
{
if(!StringUtils.isEqual(mMessageType, type))
{ {
mMessageType = type; mMessageType = type;
broadcast( Attribute.MESSAGE_TYPE ); broadcast(new AttributeChangeRequest<String>(Attribute.MESSAGE_TYPE, getMessageType()));
}
} }
} }

View File

@@ -17,19 +17,6 @@
******************************************************************************/ ******************************************************************************/
package playlist.version1; package playlist.version1;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import module.decode.lj1200.LJ1200Message.Function;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias; import alias.Alias;
import alias.action.AliasAction; import alias.action.AliasAction;
import alias.action.beep.BeepAction; import alias.action.beep.BeepAction;
@@ -48,7 +35,16 @@ import alias.id.siteID.SiteID;
import alias.id.status.StatusID; import alias.id.status.StatusID;
import alias.id.talkgroup.TalkgroupID; import alias.id.talkgroup.TalkgroupID;
import alias.id.uniqueID.UniqueID; import alias.id.uniqueID.UniqueID;
import audio.metadata.MetadataType; import module.decode.lj1200.LJ1200Message.Function;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@XmlSeeAlso({Alias.class, @XmlSeeAlso({Alias.class,
@@ -527,57 +523,4 @@ public class AliasListOld implements Comparable<AliasListOld>
{ {
return getName().compareTo(otherAliasList.getName()); return getName().compareTo(otherAliasList.getName());
} }
public Alias getAlias( String value, MetadataType type )
{
switch( type )
{
case ESN:
return getESNAlias( value );
case FLEETSYNC:
return getFleetsyncAlias( value );
case MDC1200:
return getMDC1200Alias( value );
case MOBILE_ID:
return getMobileIDNumberAlias( value );
case MPT1327:
return getMPT1327Alias( value );
case SITE_ID:
return getSiteID( value );
case STATUS:
if( value != null )
{
try
{
return getStatus( Integer.valueOf( value ) );
}
catch( Exception e )
{
//do nothing, we couldn't parse the int value
}
}
break;
case FROM:
case TO:
return getTalkgroupAlias( value );
case UNIQUE_ID:
if( value != null )
{
try
{
return getUniqueID( Integer.valueOf( value ) );
}
catch( Exception e )
{
//do nothing, we couldn't parse the int value
}
}
break;
default:
break;
}
return null;
}
} }

View File

@@ -20,7 +20,7 @@ package record;
import audio.AudioPacket; import audio.AudioPacket;
import audio.IAudioPacketListener; import audio.IAudioPacketListener;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import module.Module; import module.Module;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -49,7 +49,7 @@ public abstract class AudioRecorder extends Module implements Listener<AudioPack
private AtomicBoolean mRunning = new AtomicBoolean(); private AtomicBoolean mRunning = new AtomicBoolean();
protected Path mPath; protected Path mPath;
protected AudioMetadata mAudioMetadata; protected Metadata mMetadata;
protected long mTimeRecordingStart; protected long mTimeRecordingStart;
protected long mTimeLastPacketReceived; protected long mTimeLastPacketReceived;
private BufferProcessor mBufferProcessor; private BufferProcessor mBufferProcessor;
@@ -79,9 +79,9 @@ public abstract class AudioRecorder extends Module implements Listener<AudioPack
/** /**
* Latest audio metadata received for this recording * Latest audio metadata received for this recording
*/ */
public AudioMetadata getMetadata() public Metadata getMetadata()
{ {
return mAudioMetadata; return mMetadata;
} }
/** /**
@@ -119,7 +119,7 @@ public abstract class AudioRecorder extends Module implements Listener<AudioPack
} }
/** /**
* Processes the audio packet and captures the latest AudioMetadata for the recording for easy access. * Processes the audio packet and captures the latest Metadata for the recording for easy access.
*/ */
@Override @Override
public void receive(AudioPacket audioPacket) public void receive(AudioPacket audioPacket)
@@ -129,9 +129,9 @@ public abstract class AudioRecorder extends Module implements Listener<AudioPack
mTimeRecordingStart = System.currentTimeMillis(); mTimeRecordingStart = System.currentTimeMillis();
mTimeLastPacketReceived = mTimeRecordingStart; mTimeLastPacketReceived = mTimeRecordingStart;
if(audioPacket.hasAudioMetadata()) if(audioPacket.hasMetadata())
{ {
mAudioMetadata = audioPacket.getAudioMetadata(); mMetadata = audioPacket.getMetadata();
} }
boolean success = mAudioPacketQueue.offer(audioPacket); boolean success = mAudioPacketQueue.offer(audioPacket);

View File

@@ -18,8 +18,7 @@
package record; package record;
import audio.AudioPacket; import audio.AudioPacket;
import audio.metadata.Metadata; import channel.metadata.Metadata;
import audio.metadata.MetadataType;
import controller.ThreadPoolManager; import controller.ThreadPoolManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -61,10 +60,10 @@ public class RecorderManager implements Listener<AudioPacket>
@Override @Override
public void receive(AudioPacket audioPacket) public void receive(AudioPacket audioPacket)
{ {
if(audioPacket.hasAudioMetadata() && if(audioPacket.hasMetadata() &&
audioPacket.getAudioMetadata().isRecordable()) audioPacket.getMetadata().isRecordable())
{ {
String identifier = audioPacket.getAudioMetadata().getIdentifier(); String identifier = audioPacket.getMetadata().getUniqueIdentifier();
if(mRecorders.containsKey(identifier)) if(mRecorders.containsKey(identifier))
{ {
@@ -125,37 +124,18 @@ public class RecorderManager implements Listener<AudioPacket>
sb.append(File.separator); sb.append(File.separator);
Metadata systemMetadata = packet.getAudioMetadata().getMetadata(MetadataType.SYSTEM); Metadata metadata = packet.getMetadata();
sb.append(systemMetadata != null ? systemMetadata.getValue() : "UNKNOWN_SYSTEM"); sb.append(metadata.getNetworkID1().hasIdentifier() ? metadata.getNetworkID1().getIdentifier() + "_" : "SYSTEM-SITE");
sb.append(metadata.getNetworkID1().hasIdentifier() ? metadata.getNetworkID1().getIdentifier() : "CHANNEL");
Metadata toMetadata = packet.getAudioMetadata().getMetadata(MetadataType.TO); if(metadata.getPrimaryAddressTo().hasIdentifier())
if(toMetadata != null)
{ {
sb.append("_TO_").append(toMetadata.getValue()); sb.append("_TO_").append(metadata.getPrimaryAddressTo().getIdentifier());
Metadata fromMetadata = packet.getAudioMetadata().getMetadata(MetadataType.FROM); if(metadata.getPrimaryAddressFrom().hasIdentifier())
if(fromMetadata != null)
{ {
sb.append("_FROM_").append(fromMetadata.getValue()); sb.append("_FROM_").append(metadata.getPrimaryAddressFrom().getIdentifier());
}
}
else
{
Metadata siteMetadata = packet.getAudioMetadata().getMetadata(MetadataType.SITE_ID);
if(siteMetadata != null)
{
sb.append("_").append(siteMetadata.getValue());
}
Metadata channelMetadata = packet.getAudioMetadata().getMetadata(MetadataType.CHANNEL_NAME);
if(channelMetadata != null)
{
sb.append("_").append(channelMetadata.getValue());
} }
} }

View File

@@ -1,6 +1,6 @@
/******************************************************************************* /*******************************************************************************
* sdrtrunk * sdrtrunk
* Copyright (C) 2014-2016 Dennis Sheirer * Copyright (C) 2014-2017 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ package record.wave;
import audio.AudioPacket; import audio.AudioPacket;
import audio.IAudioPacketListener; import audio.IAudioPacketListener;
import audio.metadata.AudioMetadata; import channel.metadata.Metadata;
import sample.Listener; import sample.Listener;
import sample.real.RealBuffer; import sample.real.RealBuffer;
@@ -29,7 +29,7 @@ import java.nio.file.Path;
public class AudioPacketMonoWaveReader extends MonoWaveReader implements Listener<RealBuffer> public class AudioPacketMonoWaveReader extends MonoWaveReader implements Listener<RealBuffer>
{ {
private AudioMetadata mMetadata = new AudioMetadata(0, false); private Metadata mMetadata = new Metadata();
private IAudioPacketListener mListener; private IAudioPacketListener mListener;
@@ -40,7 +40,6 @@ public class AudioPacketMonoWaveReader extends MonoWaveReader implements Listene
* @param realTime causes the read() method to read and dispatch audio packets in real time. Note: when using * @param realTime causes the read() method to read and dispatch audio packets in real time. Note: when using
* real time playback, the thread calling the read() method will sleep as needed to effect real-time playback, * real time playback, the thread calling the read() method will sleep as needed to effect real-time playback,
* therefore you should invoke read() on a separate thread if this will impact the calling thread. * therefore you should invoke read() on a separate thread if this will impact the calling thread.
*
* @throws IOException on any file IO errors * @throws IOException on any file IO errors
*/ */
public AudioPacketMonoWaveReader(Path path, boolean realTime) throws IOException public AudioPacketMonoWaveReader(Path path, boolean realTime) throws IOException
@@ -49,7 +48,7 @@ public class AudioPacketMonoWaveReader extends MonoWaveReader implements Listene
setListener(this); setListener(this);
} }
public void setMetadata(AudioMetadata metadata) public void setMetadata(Metadata metadata)
{ {
mMetadata = metadata; mMetadata = metadata;
} }

41
src/util/StringUtils.java Normal file
View File

@@ -0,0 +1,41 @@
/*******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2017 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
package util;
public class StringUtils
{
/**
* Compares string a to b and returns true if a is non-null and non-empty, b is non-null and non-empty, and
* a is equal to b.
* @param a string to compare
* @param b string to compare
*/
public static boolean isEqual(String a, String b)
{
return !isEmpty(a) && !isEmpty(b) && a.equals(b);
}
/**
* Checks the string for null or empty condition
*/
public static boolean isEmpty(String a)
{
return a == null || a.isEmpty();
}
}