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

#632 Resolves issue with audio recordings and from identifiers stemming from changes to the way radio IDs are handled. (#634)

Browse Source
This commit is contained in:
Denny Sheirer
2020-01-05 15:48:47 -05:00
committed by GitHub
parent b8c24680a5
commit 085ba52294
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/io/github/dsheirer/record/RecorderManager.java
View File

@@ -1,7 +1,7 @@
/* /*
* *
* * ****************************************************************************** * * ******************************************************************************
* * Copyright (C) 2014-2019 Dennis Sheirer * * Copyright (C) 2014-2020 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
@@ -280,14 +280,32 @@ public class RecorderManager implements Listener<ReusableAudioPacket>
String toValue = ((IntegerIdentifier)to).getValue().toString().replace(":", ""); String toValue = ((IntegerIdentifier)to).getValue().toString().replace(":", "");
sb.append("_TO_").append(toValue); sb.append("_TO_").append(toValue);
} }
else
{
List<Identifier> toIdentifiers = identifierCollection.getIdentifiers(Role.TO);
Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.TALKGROUP, Role.FROM); if(!toIdentifiers.isEmpty())
{
sb.append("_TO_").append(toIdentifiers.get(0)).toString();
}
}
Identifier from = identifierCollection.getIdentifier(IdentifierClass.USER, Form.RADIO, Role.FROM);
if(from != null) if(from != null)
{ {
String fromValue = ((IntegerIdentifier)from).getValue().toString().replace(":", ""); String fromValue = ((IntegerIdentifier)from).getValue().toString().replace(":", "");
sb.append("_FROM_").append(fromValue); sb.append("_FROM_").append(fromValue);
} }
else
{
List<Identifier> fromIdentifiers = identifierCollection.getIdentifiers(Role.FROM);
if(!fromIdentifiers.isEmpty())
{
sb.append("_FROM_").append(fromIdentifiers.get(0)).toString();
}
}
} }
else else
{ {