GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 10:07:26 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

OpenMHz Broadcast Enhancements (#2207)

Browse Source
This commit is contained in:
tadscottsmith
2025-03-22 06:26:15 -04:00
committed by GitHub
parent 728a85c180
commit 5dbcd5a8ad
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/io/github/dsheirer/audio/broadcast/openmhz/FormField.java
View File

@@ -34,7 +34,8 @@
API_KEY("api_key"), API_KEY("api_key"),
SOURCE_LIST("source_list"), SOURCE_LIST("source_list"),
FREQ_LIST("freq_list"), FREQ_LIST("freq_list"),
PATCHES("patches"); PATCH_LIST("patch_list"),
TALKER_ALIAS("talker_alias");
private String mHeader; private String mHeader;

28
src/main/java/io/github/dsheirer/audio/broadcast/openmhz/OpenMHzBroadcaster.java
View File

@@ -40,6 +40,7 @@
import io.github.dsheirer.identifier.patch.PatchGroup; import io.github.dsheirer.identifier.patch.PatchGroup;
import io.github.dsheirer.identifier.patch.PatchGroupIdentifier; import io.github.dsheirer.identifier.patch.PatchGroupIdentifier;
import io.github.dsheirer.identifier.radio.RadioIdentifier; import io.github.dsheirer.identifier.radio.RadioIdentifier;
import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier; import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
import io.github.dsheirer.util.ThreadPool; import io.github.dsheirer.util.ThreadPool;
import org.slf4j.Logger; import org.slf4j.Logger;
@@ -249,6 +250,7 @@
long timestampSeconds = (int)(audioRecording.getStartTime() / 1E3); long timestampSeconds = (int)(audioRecording.getStartTime() / 1E3);
String talkgroup = getTo(audioRecording); String talkgroup = getTo(audioRecording);
String radioId = getFrom(audioRecording); String radioId = getFrom(audioRecording);
String talkerAlias = getTalkerAlias(audioRecording);
Long frequency = getFrequency(audioRecording); Long frequency = getFrequency(audioRecording);
String patches = getPatches(audioRecording); String patches = getPatches(audioRecording);
String talkgroupLabel = getTalkgroupLabel(audioRecording); String talkgroupLabel = getTalkgroupLabel(audioRecording);
@@ -282,8 +284,8 @@
.addPart(FormField.TALKGROUP_NUM, talkgroup) .addPart(FormField.TALKGROUP_NUM, talkgroup)
.addPart(FormField.EMERGENCY, 0) .addPart(FormField.EMERGENCY, 0)
.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey()) .addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
// For future use if OpenMHz supports patch information .addPart(FormField.PATCH_LIST, patches)
//.addPart(FormField.PATCHES, patches) .addPart(FormField.TALKER_ALIAS, talkerAlias)
.addPart(FormField.SOURCE_LIST, "[{ \"pos\": 0.00, \"src\": " + radioId + "}]"); .addPart(FormField.SOURCE_LIST, "[{ \"pos\": 0.00, \"src\": " + radioId + "}]");
HttpRequest fileRequest = HttpRequest.newBuilder() HttpRequest fileRequest = HttpRequest.newBuilder()
@@ -547,6 +549,28 @@
return "[]"; return "[]";
} }
/**
* Creates a formatted string with talkerAlias identifier
*/
private static String getTalkerAlias(AudioRecording audioRecording)
{
for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
{
if(identifier instanceof TalkerAliasIdentifier)
{
TalkerAliasIdentifier talkerID = (TalkerAliasIdentifier)identifier;
if(talkerID.isValid())
{
return talkerID.getValue();
}
}
}
return "";
}
/** /**
* Tests both the connection and configuration against the OpenMHz Call API service * Tests both the connection and configuration against the OpenMHz Call API service
* @param configuration containing API key and system id * @param configuration containing API key and system id