Removes audio inversion from talkgroup id and editor. The audio

processing architecture will be updated in the next version and will
handle identifying and processing audio inversion on a per-alias basis.
This commit is contained in:
denny
2016-02-06 09:30:52 -05:00
parent 2892e4609e
commit 8e11cb4554
2 changed files with 2 additions and 53 deletions

View File

@@ -27,7 +27,6 @@ import audio.inverted.AudioType;
public class TalkgroupID extends AliasID public class TalkgroupID extends AliasID
{ {
private String mTalkgroup; private String mTalkgroup;
private AudioType mAudioType;
public TalkgroupID() public TalkgroupID()
{ {
@@ -44,20 +43,9 @@ public class TalkgroupID extends AliasID
mTalkgroup = talkgroup; mTalkgroup = talkgroup;
} }
@XmlAttribute
public AudioType getAudioType()
{
return mAudioType;
}
public void setAudioType( AudioType type )
{
mAudioType = type;
}
public boolean hasAudioType() public boolean hasAudioType()
{ {
return mAudioType != null; return false;
} }
public String toString() public String toString()
@@ -66,13 +54,6 @@ public class TalkgroupID extends AliasID
sb.append( "Talkgroup: " + mTalkgroup ); sb.append( "Talkgroup: " + mTalkgroup );
if( mAudioType != null )
{
sb.append( " [Audio " );
sb.append( mAudioType.getShortDisplayString() );
sb.append( "]" );
}
return sb.toString(); return sb.toString();
} }

View File

@@ -40,17 +40,12 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener
private JLabel mLabelName; private JLabel mLabelName;
private JTextField mTextTalkgroupID; private JTextField mTextTalkgroupID;
private JLabel mLabelAudio;
private JComboBox<AudioType> mComboAudioTypes;
private String mHelpText = "Enter a formatted talkgroup identifier.\n\n" private String mHelpText = "Enter a formatted talkgroup identifier.\n\n"
+ "LTR Talkgroup Format: A-HH-TTT (A=Area, H=Home Repeater, " + "LTR Talkgroup Format: A-HH-TTT (A=Area, H=Home Repeater, "
+ "T=Talkgroup)\n\n" + "T=Talkgroup)\n\n"
+ "Passport Talkgroup Format: xxxxx (up to 5-digit number)\n\n" + "Passport Talkgroup Format: xxxxx (up to 5-digit number)\n\n"
+ "Wildcard: use one or more asterisks (*) for any talkgroup digits.\n\n" + "Wildcard: use one or more asterisks (*) for any talkgroup digits.";
+ "Audio: if the talkgroup uses simple frequency inversion, specify"
+ " the inversion frequency from the dropdown list to automatically"
+ " un-invert audio for this specific talkgroup";
public TalkgroupIDEditor( TalkgroupIDNode talkgroupIDNode ) public TalkgroupIDEditor( TalkgroupIDNode talkgroupIDNode )
{ {
@@ -72,22 +67,6 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener
add( mTextTalkgroupID, "growx,push" ); add( mTextTalkgroupID, "growx,push" );
add( new JLabel( "Audio:" ) );
mComboAudioTypes = new JComboBox<AudioType>();
mComboAudioTypes.setModel(
new DefaultComboBoxModel<AudioType>( AudioType.values() ) );
AudioType audioType = mTalkgroupIDNode.getTalkgroupID().getAudioType();
if( audioType != null )
{
mComboAudioTypes.setSelectedItem( audioType );
}
add( mComboAudioTypes, "growx,push" );
JButton btnSave = new JButton( "Save" ); JButton btnSave = new JButton( "Save" );
btnSave.addActionListener( TalkgroupIDEditor.this ); btnSave.addActionListener( TalkgroupIDEditor.this );
add( btnSave, "growx,push" ); add( btnSave, "growx,push" );
@@ -117,14 +96,6 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener
((ConfigurableNode)mTalkgroupIDNode.getParent()).sort(); ((ConfigurableNode)mTalkgroupIDNode.getParent()).sort();
AudioType selected = mComboAudioTypes
.getItemAt( mComboAudioTypes.getSelectedIndex() );
if( selected != null )
{
mTalkgroupIDNode.getTalkgroupID().setAudioType( selected );
}
mTalkgroupIDNode.save(); mTalkgroupIDNode.save();
mTalkgroupIDNode.show(); mTalkgroupIDNode.show();
@@ -139,9 +110,6 @@ public class TalkgroupIDEditor extends JPanel implements ActionListener
{ {
mTextTalkgroupID.setText( mTextTalkgroupID.setText(
mTalkgroupIDNode.getTalkgroupID().getTalkgroup() ); mTalkgroupIDNode.getTalkgroupID().getTalkgroup() );
mComboAudioTypes.setSelectedItem(
mTalkgroupIDNode.getTalkgroupID().getAudioType() );
} }
mTalkgroupIDNode.refresh(); mTalkgroupIDNode.refresh();