mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-20 04:27:48 -05:00
Compare commits
239 Commits
v0.6.1-bet
...
2717-tuner
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
463a805890 | ||
|
|
156dd40bfe | ||
|
|
e01dd02b74 | ||
|
|
8324233acb | ||
|
|
838e7708c0 | ||
|
|
d3a9adc06f | ||
|
|
cd098955aa | ||
|
|
61efb3d299 | ||
|
|
6d89a604c3 | ||
|
|
3473150ee9 | ||
|
|
ff6e2bd710 | ||
|
|
f302d46be1 | ||
|
|
f47479b8d4 | ||
|
|
bc7dd201ab | ||
|
|
c46b80b06b | ||
|
|
7f1e7d9cd2 | ||
|
|
7a7364839b | ||
|
|
2213544eec | ||
|
|
feeedb7c29 | ||
|
|
6dd06288ac | ||
|
|
5fd469c402 | ||
|
|
0bc5d6db64 | ||
|
|
80754558d6 | ||
|
|
2f9d52a56a | ||
|
|
5474a5a448 | ||
|
|
c93d099742 | ||
|
|
be0966653b | ||
|
|
26a24fc6ad | ||
|
|
9deabd0dcc | ||
|
|
2db41393dc | ||
|
|
29a10edf03 | ||
|
|
5bce541631 | ||
|
|
9641d2ef59 | ||
|
|
73fc85aa76 | ||
|
|
aad971db9c | ||
|
|
73d3238644 | ||
|
|
4626d56730 | ||
|
|
1a90eaf6c6 | ||
|
|
fbc54a38dd | ||
|
|
07b61be257 | ||
|
|
74dc32538f | ||
|
|
7fcf035337 | ||
|
|
a53f6e9d99 | ||
|
|
e7f4f655e5 | ||
|
|
000ac51ff0 | ||
|
|
23cee388de | ||
|
|
5c73fb318f | ||
|
|
066554393f | ||
|
|
303c0a98cc | ||
|
|
02c62d012f | ||
|
|
a4ec04a499 | ||
|
|
006e382b34 | ||
|
|
beb2593dd9 | ||
|
|
657cbf5c55 | ||
|
|
aff34fa5eb | ||
|
|
22cd8968cb | ||
|
|
ec7efa4d17 | ||
|
|
07fd8c2923 | ||
|
|
a7301e93d9 | ||
|
|
5912a958b3 | ||
|
|
9ca4ae4d8f | ||
|
|
6cd2cea30b | ||
|
|
ba16c8b377 | ||
|
|
d72c5d87be | ||
|
|
dea3a3a41e | ||
|
|
48296990e9 | ||
|
|
289150d415 | ||
|
|
69d49d9dd0 | ||
|
|
e8e813142b | ||
|
|
968705a589 | ||
|
|
1c097491d9 | ||
|
|
0b3ce66cad | ||
|
|
14c77c4926 | ||
|
|
8aadbe4706 | ||
|
|
19d18b96b3 | ||
|
|
59e64a73ff | ||
|
|
8b338dec2d | ||
|
|
bab02222a4 | ||
|
|
9359f523c1 | ||
|
|
e385d2fdec | ||
|
|
49c3d3ff55 | ||
|
|
7b249af944 | ||
|
|
197cec04f3 | ||
|
|
c75baa48f4 | ||
|
|
866aadc8c3 | ||
|
|
276f4a316a | ||
|
|
e65ff5a8dc | ||
|
|
85bfd21257 | ||
|
|
9ebbf957a2 | ||
|
|
00c0418017 | ||
|
|
33a2471338 | ||
|
|
d86fba6945 | ||
|
|
248fe3e4f7 | ||
|
|
9a6dc2b0a0 | ||
|
|
6b9cd2d317 | ||
|
|
f2c98cdb40 | ||
|
|
5635341d12 | ||
|
|
df739f525f | ||
|
|
c8b1c8ed3a | ||
|
|
b0428a1d8b | ||
|
|
c0a96f94fb | ||
|
|
1945b83562 | ||
|
|
dc550f3121 | ||
|
|
0460f2b77b | ||
|
|
b37ed51d07 | ||
|
|
f1183e531d | ||
|
|
16a66112fc | ||
|
|
8aa6ae089a | ||
|
|
728a83a82d | ||
|
|
c05328cd1e | ||
|
|
a9120ed65e | ||
|
|
9305abc784 | ||
|
|
0c637ed80d | ||
|
|
7ee3c5d251 | ||
|
|
a33c99347b | ||
|
|
97cae50bdd | ||
|
|
80360029ef | ||
|
|
af5dbcfcdc | ||
|
|
9dcebb4943 | ||
|
|
e2d9c4cda3 | ||
|
|
3e21887d27 | ||
|
|
d60720aab7 | ||
|
|
2292af6c07 | ||
|
|
ff128f56d2 | ||
|
|
3c01c644c9 | ||
|
|
ade4dc47cd | ||
|
|
cbbbe3a131 | ||
|
|
b385a42b63 | ||
|
|
ccae1d05e7 | ||
|
|
788d994ad7 | ||
|
|
7cf6974b6b | ||
|
|
cf0737ed90 | ||
|
|
75fa495c99 | ||
|
|
7945f0ce63 | ||
|
|
a053315675 | ||
|
|
de0e722f0c | ||
|
|
a42592daa9 | ||
|
|
7f9dc86b23 | ||
|
|
2f5c165aec | ||
|
|
29164ac75d | ||
|
|
185df1735a | ||
|
|
c81e6cccfa | ||
|
|
a2509554db | ||
|
|
b83f77c7c6 | ||
|
|
d8e2e0ac57 | ||
|
|
b0a0ad4b43 | ||
|
|
17cdd0df27 | ||
|
|
6d23aaa06f | ||
|
|
933629e30d | ||
|
|
8a6bc03ffc | ||
|
|
0c616d4531 | ||
|
|
b472c68b80 | ||
|
|
f6f4b07623 | ||
|
|
de100b4662 | ||
|
|
bbde3033b7 | ||
|
|
f6866f5408 | ||
|
|
d09fad56db | ||
|
|
7c06075880 | ||
|
|
5b597e29eb | ||
|
|
feb66831d4 | ||
|
|
37d47f4219 | ||
|
|
0d886c272e | ||
|
|
48202da9e4 | ||
|
|
c4d9d58a5d | ||
|
|
fe5679fed7 | ||
|
|
b2be38b239 | ||
|
|
912925ee7d | ||
|
|
d86f8bf3d9 | ||
|
|
88d8633958 | ||
|
|
3bf3de82fc | ||
|
|
03a015f504 | ||
|
|
15b7923a4f | ||
|
|
189173e289 | ||
|
|
2dcd994eb2 | ||
|
|
afadb227db | ||
|
|
5dbcd5a8ad | ||
|
|
728a85c180 | ||
|
|
dd6ddd59e9 | ||
|
|
758794fdb4 | ||
|
|
49b95a9445 | ||
|
|
a4bcdfa769 | ||
|
|
872498badc | ||
|
|
4afb74a847 | ||
|
|
96f0b7dd55 | ||
|
|
b360950b80 | ||
|
|
5b0a1401a1 | ||
|
|
3fa114501b | ||
|
|
8935835921 | ||
|
|
dec255d444 | ||
|
|
1cb0490985 | ||
|
|
c8235ea4fc | ||
|
|
7d69d829b5 | ||
|
|
a46abf7da8 | ||
|
|
437264e272 | ||
|
|
8718d04ef5 | ||
|
|
4e367bb5fe | ||
|
|
71d2cb6fca | ||
|
|
e856de273d | ||
|
|
ea0a9da24c | ||
|
|
b3cd7d787a | ||
|
|
9a13a82ed1 | ||
|
|
9b71508d49 | ||
|
|
694ea83a80 | ||
|
|
70fb74b787 | ||
|
|
9ffa02e2e5 | ||
|
|
11abb87177 | ||
|
|
49cf92c7ab | ||
|
|
4cf51405ea | ||
|
|
db83d5121c | ||
|
|
d61d9c07b0 | ||
|
|
5c9c3fa503 | ||
|
|
552d3a6ce9 | ||
|
|
3bf425f94a | ||
|
|
660a5acd2f | ||
|
|
551277f399 | ||
|
|
a12040be5c | ||
|
|
e4be7dc5f4 | ||
|
|
b615c1e16a | ||
|
|
912af4e3e6 | ||
|
|
df0d0468c8 | ||
|
|
7509245751 | ||
|
|
02e236202c | ||
|
|
4b1d294211 | ||
|
|
40840dbd5c | ||
|
|
786ae9369b | ||
|
|
b7bbf10415 | ||
|
|
486ac01416 | ||
|
|
9e01cc48a5 | ||
|
|
37996d0477 | ||
|
|
a15ff9040b | ||
|
|
b3cd3f431f | ||
|
|
649d1f650a | ||
|
|
215e4064fa | ||
|
|
66a0b2543b | ||
|
|
378841b408 | ||
|
|
e28d726182 | ||
|
|
71bc27e3d9 | ||
|
|
bcfb2700cb | ||
|
|
2d9491ac93 |
5
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
5
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
blank_issues_enabled: false
|
||||||
|
contact_links:
|
||||||
|
- name: Support and Questions - How do I XXX? Does it support XXX?
|
||||||
|
url: https://github.com/DSheirer/sdrtrunk/wiki/Support
|
||||||
|
about: Please ask your user questions here -- DO NOT create an issue if you have a user question please!!
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
---
|
|
||||||
name: How-To Question or Does The Software Support xxx
|
|
||||||
about: End user question or support discussion
|
|
||||||
title: STOP - Don't Use Issue Reporting to Post End-User Questions!!!
|
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
STOP !!!!
|
|
||||||
|
|
||||||
GitHub issues are for reporting software bugs or requesting enhancements.
|
|
||||||
|
|
||||||
If you have a question about how to use the software, or if you want to know if sdrtrunk supports a protocol, tuner, or other aspect, please post your question in one of the Support forums.
|
|
||||||
|
|
||||||
Visit: https://github.com/DSheirer/sdrtrunk/wiki
|
|
||||||
14
.github/workflows/gradle.yml
vendored
14
.github/workflows/gradle.yml
vendored
@@ -21,14 +21,14 @@ jobs:
|
|||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
- name: Set up JDK 23
|
- name: Set up JDK 27
|
||||||
uses: actions/setup-java@v3
|
uses: actions/setup-java@v6
|
||||||
with:
|
with:
|
||||||
java-version: '23'
|
java-version: '27'
|
||||||
distribution: 'liberica'
|
distribution: 'liberica'
|
||||||
java-package: 'jdk+fx'
|
java-package: 'jdk+fx'
|
||||||
|
- name: Set up Gradle
|
||||||
|
uses: gradle/actions/setup-gradle@v6
|
||||||
- name: Build with Gradle
|
- name: Build with Gradle
|
||||||
uses: gradle/gradle-build-action@v2
|
run: ./gradlew clean build
|
||||||
with:
|
|
||||||
arguments: clean build
|
|
||||||
|
|||||||
36
.github/workflows/nightly.yml
vendored
36
.github/workflows/nightly.yml
vendored
@@ -13,35 +13,39 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v7
|
||||||
|
|
||||||
- name: Set up JDK 23
|
|
||||||
uses: actions/setup-java@v3
|
|
||||||
with:
|
with:
|
||||||
java-version: '23'
|
# Full history and tags, so the build can describe the commit relative to the latest version tag
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
- name: Set up JDK 27
|
||||||
|
uses: actions/setup-java@v6
|
||||||
|
with:
|
||||||
|
# Must match the JDK version downloaded in build.gradle (jdk_download_base) - jlink requires an exact version match
|
||||||
|
java-version: '27.0.0'
|
||||||
distribution: 'liberica'
|
distribution: 'liberica'
|
||||||
java-package: 'jdk+fx'
|
java-package: 'jdk+fx'
|
||||||
|
|
||||||
|
- name: Set up Gradle
|
||||||
|
uses: gradle/actions/setup-gradle@v6
|
||||||
|
|
||||||
- name: Build Linux and Mac releases with Gradle
|
- name: Build Linux and Mac releases with Gradle
|
||||||
uses: gradle/gradle-build-action@v2
|
run: ./gradlew runtimeZipOthers -PprojectVersion=nightly
|
||||||
with:
|
|
||||||
arguments: runtimeZipOthers -PprojectVersion=nightly
|
|
||||||
|
|
||||||
- name: Build Windows release with Gradle
|
- name: Build Windows release with Gradle
|
||||||
uses: gradle/gradle-build-action@v2
|
run: ./gradlew runtimeZipWindows -PprojectVersion=nightly
|
||||||
with:
|
|
||||||
arguments: runtimeZipWindows -PprojectVersion=nightly
|
|
||||||
|
|
||||||
- name: Create Build Info file
|
- name: Create Build Info file
|
||||||
run: |
|
run: |
|
||||||
echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/image/build_info.txt
|
echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\ndescribe: $(git describe --tags --match 'v[0-9]*' --dirty)\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/image/build_info.txt
|
||||||
|
|
||||||
- name: Add build artifacts to nightly release
|
- name: Add build artifacts to nightly release
|
||||||
uses: pyTooling/Actions/releaser@main
|
uses: softprops/action-gh-release@v3
|
||||||
with:
|
with:
|
||||||
tag: nightly
|
tag_name: nightly
|
||||||
rm: false
|
prerelease: true
|
||||||
token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
files: |
|
files: |
|
||||||
build/image/*.zip
|
build/image/*.zip
|
||||||
build/image/build_info.txt
|
build/image/build_info.txt
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|||||||
132
.github/workflows/release.yml
vendored
Normal file
132
.github/workflows/release.yml
vendored
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
# Publishes a release when a version tag is pushed: v0.6.2 for a final release,
|
||||||
|
# or v0.6.2-beta-1 / v0.6.2-alpha-1 for a pre-release. The build derives the
|
||||||
|
# version from the tag (see build.gradle).
|
||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags: ['v[0-9]+.[0-9]+.[0-9]+*']
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
version: ${{ steps.version.outputs.version }}
|
||||||
|
previous_tag: ${{ steps.previous.outputs.tag }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v7
|
||||||
|
with:
|
||||||
|
# Full history and tags, to find the previous release tag for the release notes
|
||||||
|
fetch-depth: 0
|
||||||
|
|
||||||
|
# Release notes list the PRs since the previous version tag (never 'nightly'). A final release
|
||||||
|
# starts from the previous final release, so it covers every alpha and beta in between.
|
||||||
|
- id: previous
|
||||||
|
run: |
|
||||||
|
exclude=(--exclude "$GITHUB_REF_NAME")
|
||||||
|
if [[ "$GITHUB_REF_NAME" != *-* ]]; then
|
||||||
|
exclude+=(--exclude '*-*')
|
||||||
|
fi
|
||||||
|
tag="$(git describe --tags --abbrev=0 --match 'v[0-9]*' "${exclude[@]}" HEAD 2>/dev/null || true)"
|
||||||
|
echo "Release notes start from: ${tag:-(GitHub default)}"
|
||||||
|
echo "tag=$tag" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Set up JDK 27
|
||||||
|
uses: actions/setup-java@v6
|
||||||
|
with:
|
||||||
|
# Must match the JDK version downloaded in build.gradle (jdk_download_base) - jlink requires an exact version match
|
||||||
|
java-version: '27.0.0'
|
||||||
|
distribution: 'liberica'
|
||||||
|
java-package: 'jdk+fx'
|
||||||
|
|
||||||
|
- name: Set up Gradle
|
||||||
|
uses: gradle/actions/setup-gradle@v6
|
||||||
|
|
||||||
|
# The version comes from 'git describe', which can pick a different tag when more than one
|
||||||
|
# version tag points at the same commit. Fail rather than publish zips with the wrong version.
|
||||||
|
- id: version
|
||||||
|
run: |
|
||||||
|
version="$(./gradlew -q printVersion --console=plain | tail -n 1)"
|
||||||
|
if [ "v$version" != "$GITHUB_REF_NAME" ]; then
|
||||||
|
echo "::error::Build version $version does not match tag $GITHUB_REF_NAME"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "version=$version" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Build and test
|
||||||
|
run: ./gradlew clean build --console=plain
|
||||||
|
|
||||||
|
# The runtime plugin can't build Windows and the other platforms in the same invocation.
|
||||||
|
- name: Build Linux and Mac releases
|
||||||
|
run: ./gradlew runtimeZipOthers --console=plain
|
||||||
|
|
||||||
|
- name: Build Windows release
|
||||||
|
run: ./gradlew runtimeZipWindows --console=plain
|
||||||
|
|
||||||
|
- name: Check release zips
|
||||||
|
env:
|
||||||
|
VERSION: ${{ steps.version.outputs.version }}
|
||||||
|
run: |
|
||||||
|
missing=0
|
||||||
|
for platform in linux-aarch64 linux-x86_64 osx-aarch64 osx-x86_64 windows-aarch64 windows-x86_64; do
|
||||||
|
zip="build/image/sdr-trunk-${platform}-v${VERSION}.zip"
|
||||||
|
if [ ! -f "$zip" ]; then
|
||||||
|
echo "::error::Missing $zip"
|
||||||
|
missing=1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
ls -l build/image/*.zip
|
||||||
|
exit $missing
|
||||||
|
|
||||||
|
- uses: actions/upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: release-zips
|
||||||
|
path: build/image/*.zip
|
||||||
|
if-no-files-found: error
|
||||||
|
retention-days: 7
|
||||||
|
|
||||||
|
publish:
|
||||||
|
needs: build
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
steps:
|
||||||
|
- uses: actions/download-artifact@v8
|
||||||
|
with:
|
||||||
|
name: release-zips
|
||||||
|
path: zips
|
||||||
|
|
||||||
|
# Publishing is split into steps that can all be repeated, so a failed
|
||||||
|
# upload or a re-run finishes the draft left behind rather than failing on
|
||||||
|
# it: gh retries uploads, and a retry of an upload that had in fact
|
||||||
|
# succeeded fails with "ReleaseAsset.name already exists" unless clobbering.
|
||||||
|
- name: Create release
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ github.token }}
|
||||||
|
GH_REPO: ${{ github.repository }}
|
||||||
|
VERSION: ${{ needs.build.outputs.version }}
|
||||||
|
PREVIOUS_TAG: ${{ needs.build.outputs.previous_tag }}
|
||||||
|
run: |
|
||||||
|
(cd zips && sha256sum *.zip > SHA256SUMS)
|
||||||
|
prerelease=()
|
||||||
|
if [[ "$GITHUB_REF_NAME" == *-* ]]; then
|
||||||
|
prerelease=(--prerelease)
|
||||||
|
fi
|
||||||
|
notes_start=()
|
||||||
|
if [ -n "$PREVIOUS_TAG" ]; then
|
||||||
|
notes_start=(--notes-start-tag "$PREVIOUS_TAG")
|
||||||
|
fi
|
||||||
|
if gh release view "$GITHUB_REF_NAME" --json isDraft --jq .isDraft 2>/dev/null | grep -qx false; then
|
||||||
|
echo "::error::Release $GITHUB_REF_NAME is already published"
|
||||||
|
exit 1
|
||||||
|
elif gh release view "$GITHUB_REF_NAME" >/dev/null 2>&1; then
|
||||||
|
echo "Reusing the draft release $GITHUB_REF_NAME"
|
||||||
|
else
|
||||||
|
gh release create "$GITHUB_REF_NAME" --draft "${prerelease[@]}" \
|
||||||
|
--verify-tag --generate-notes "${notes_start[@]}" --title "Version $VERSION"
|
||||||
|
fi
|
||||||
|
gh release upload "$GITHUB_REF_NAME" zips/* --clobber
|
||||||
|
gh release edit "$GITHUB_REF_NAME" --draft=false
|
||||||
6
.idea/dictionaries/denny.xml
generated
6
.idea/dictionaries/denny.xml
generated
@@ -2,18 +2,24 @@
|
|||||||
<dictionary name="denny">
|
<dictionary name="denny">
|
||||||
<words>
|
<words>
|
||||||
<w>bahroo</w>
|
<w>bahroo</w>
|
||||||
|
<w>baseband</w>
|
||||||
<w>basebanded</w>
|
<w>basebanded</w>
|
||||||
<w>broadcastify</w>
|
<w>broadcastify</w>
|
||||||
|
<w>cach</w>
|
||||||
<w>correlator</w>
|
<w>correlator</w>
|
||||||
<w>deinterleave</w>
|
<w>deinterleave</w>
|
||||||
<w>descrambled</w>
|
<w>descrambled</w>
|
||||||
|
<w>dibit</w>
|
||||||
<w>dinf</w>
|
<w>dinf</w>
|
||||||
|
<w>dqpsk</w>
|
||||||
<w>esnid</w>
|
<w>esnid</w>
|
||||||
<w>fleetsync</w>
|
<w>fleetsync</w>
|
||||||
<w>heterdyned</w>
|
<w>heterdyned</w>
|
||||||
<w>heterodynes</w>
|
<w>heterodynes</w>
|
||||||
|
<w>hytera</w>
|
||||||
<w>icecast</w>
|
<w>icecast</w>
|
||||||
<w>ident</w>
|
<w>ident</w>
|
||||||
|
<w>lcns</w>
|
||||||
<w>nutall</w>
|
<w>nutall</w>
|
||||||
<w>overflowable</w>
|
<w>overflowable</w>
|
||||||
<w>polyphase</w>
|
<w>polyphase</w>
|
||||||
|
|||||||
45
.idea/misc.xml
generated
45
.idea/misc.xml
generated
@@ -4,7 +4,50 @@
|
|||||||
<component name="FrameworkDetectionExcludesConfiguration">
|
<component name="FrameworkDetectionExcludesConfiguration">
|
||||||
<file type="web" url="file://$PROJECT_DIR$" />
|
<file type="web" url="file://$PROJECT_DIR$" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_23_PREVIEW" project-jdk-name="liberica-23" project-jdk-type="JavaSDK">
|
<component name="NullableNotNullManager">
|
||||||
|
<option name="myDefaultNullable" value="org.jetbrains.annotations.Nullable" />
|
||||||
|
<option name="myDefaultNotNull" value="org.jetbrains.annotations.NotNull" />
|
||||||
|
<option name="myOrdered" value="true" />
|
||||||
|
<option name="myNullables">
|
||||||
|
<value>
|
||||||
|
<list size="13">
|
||||||
|
<item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.Nullable" />
|
||||||
|
<item index="1" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
|
||||||
|
<item index="2" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
|
||||||
|
<item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
|
||||||
|
<item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
|
||||||
|
<item index="5" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
|
||||||
|
<item index="6" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
|
||||||
|
<item index="7" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
|
||||||
|
<item index="8" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
|
||||||
|
<item index="9" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
|
||||||
|
<item index="10" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
|
||||||
|
<item index="11" class="java.lang.String" itemvalue="org.springframework.lang.Nullable" />
|
||||||
|
<item index="12" class="java.lang.String" itemvalue="jakarta.annotation.Nullable" />
|
||||||
|
</list>
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
<option name="myNotNulls">
|
||||||
|
<value>
|
||||||
|
<list size="13">
|
||||||
|
<item index="0" class="java.lang.String" itemvalue="org.jspecify.annotations.NonNull" />
|
||||||
|
<item index="1" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
|
||||||
|
<item index="2" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
|
||||||
|
<item index="3" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
|
||||||
|
<item index="4" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
|
||||||
|
<item index="5" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
|
||||||
|
<item index="6" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
|
||||||
|
<item index="7" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
|
||||||
|
<item index="8" class="java.lang.String" itemvalue="lombok.NonNull" />
|
||||||
|
<item index="9" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
|
||||||
|
<item index="10" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
|
||||||
|
<item index="11" class="java.lang.String" itemvalue="org.springframework.lang.NonNull" />
|
||||||
|
<item index="12" class="java.lang.String" itemvalue="jakarta.annotation.Nonnull" />
|
||||||
|
</list>
|
||||||
|
</value>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_27_PREVIEW" project-jdk-name="liberica-27" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
47
README.md
47
README.md
@@ -1,17 +1,29 @@
|
|||||||

|

|
||||||

|

|
||||||
|
[](https://github.com/DSheirer/sdrtrunk/releases/latest)
|
||||||
|
[](https://github.com/DSheirer/sdrtrunk/releases)
|
||||||
|
[](LICENSE)
|
||||||
|
[](https://discord.gg/HJQaKYE)
|
||||||
|
[](https://groups.google.com/g/sdrtrunk)
|
||||||
|
|
||||||
# sdrtrunk
|
# sdrtrunk
|
||||||
A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
|
A cross-platform java application for decoding, monitoring, recording and streaming trunked mobile and related radio protocols using Software Defined Radios (SDR).
|
||||||
|
|
||||||
|
> ## 📖 [Read the sdrtrunk User Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
|
||||||
|
> New to sdrtrunk? Start with the **[Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)** guide,
|
||||||
|
> then use the **[User Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)** and
|
||||||
|
> **[How-To Guides](https://github.com/DSheirer/sdrtrunk/wiki/How-To-Guides)** to set up tuners, playlists, aliases and streaming.
|
||||||
|
|
||||||
* [Help/Wiki Home Page](https://github.com/DSheirer/sdrtrunk/wiki)
|
* [Help/Wiki Home Page](https://github.com/DSheirer/sdrtrunk/wiki)
|
||||||
* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
|
* [Getting Started](https://github.com/DSheirer/sdrtrunk/wiki/Getting-Started)
|
||||||
* [User's Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
|
* [User Manual](https://github.com/DSheirer/sdrtrunk/wiki/User-Manual)
|
||||||
|
* [How-To Guides](https://github.com/DSheirer/sdrtrunk/wiki/How-To-Guides)
|
||||||
|
* [FAQ](https://github.com/DSheirer/sdrtrunk/wiki/FAQ)
|
||||||
* [Download](https://github.com/DSheirer/sdrtrunk/releases)
|
* [Download](https://github.com/DSheirer/sdrtrunk/releases)
|
||||||
* [Support](https://github.com/DSheirer/sdrtrunk/wiki/Support)
|
* [Support](https://github.com/DSheirer/sdrtrunk/wiki/Support)
|
||||||
|
|
||||||

|

|
||||||
**Figure 1:** sdrtrunk Application Screenshot
|
**Figure 1:** sdrtrunk decoding a P25 Phase 1 simulcast trunked radio system
|
||||||
|
|
||||||
## Download the Latest Release
|
## Download the Latest Release
|
||||||
All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
|
All release versions of sdrtrunk are available from the [releases](https://github.com/DSheirer/sdrtrunk/releases) tab.
|
||||||
@@ -28,6 +40,33 @@ playlist(s) before you use the nightly builds.** Note: the nightly release is u
|
|||||||
committed to the code base, so it's not really 'nightly' as much as it is 'current'.
|
committed to the code base, so it's not really 'nightly' as much as it is 'current'.
|
||||||
|
|
||||||
## Minimum System Requirements
|
## Minimum System Requirements
|
||||||
* **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac/Linux (64-bit, 10.14 or higher)
|
* **Operating System:** Windows (~~32 or~~ 64-bit), Linux (~~32 or~~ 64-bit) or Mac (64-bit, 12.x or higher)
|
||||||
* **CPU:** 4-core
|
* **CPU:** 4-core
|
||||||
* **RAM:** 8GB or more (preferred). Depending on usage, 4GB may be sufficient.
|
* **RAM:** 8GB or more (preferred). Depending on usage, 4GB may be sufficient.
|
||||||
|
|
||||||
|
## Creating a Release (Maintainers)
|
||||||
|
Releases are built and published automatically by the [Release](.github/workflows/release.yml) GitHub workflow
|
||||||
|
whenever a version tag is pushed to the repository.
|
||||||
|
|
||||||
|
The version is taken from the tag, so there is no version number to update in the code. Create and push a tag
|
||||||
|
with a leading `v`, following the naming convention described in `gradle.properties` (e.g. `v0.6.2-alpha-1`,
|
||||||
|
`v0.6.2-beta-1` or `v0.6.2`):
|
||||||
|
```
|
||||||
|
git tag v0.6.2-beta-1
|
||||||
|
git push origin v0.6.2-beta-1
|
||||||
|
```
|
||||||
|
|
||||||
|
Builds made from an untagged commit get a version like `0.6.2-beta-1-14-g4626d567` (14 commits after the
|
||||||
|
`v0.6.2-beta-1` tag, at commit `4626d567`), with `-dirty` appended when there are uncommitted changes.
|
||||||
|
|
||||||
|
The workflow then:
|
||||||
|
* Verifies that the version the build derives from git matches the tag and fails if it does not.
|
||||||
|
* Builds and tests the code, then creates the release zips for Linux, Mac and Windows (x86-64 and aarch64).
|
||||||
|
* Creates a GitHub release titled `Version <version>` with auto-generated release notes (a "What's Changed" list of
|
||||||
|
the PRs merged since the previous version tag), and attaches the six zip
|
||||||
|
files plus a `SHA256SUMS` checksum file.
|
||||||
|
* Marks tags containing a dash (alpha and beta versions) as pre-releases. Tags without a dash become full releases.
|
||||||
|
|
||||||
|
If the workflow fails part way through, fix the problem and re-run it from the Actions tab. It resumes from the
|
||||||
|
draft release left behind. It won't modify a release that has already been published. To rebuild a published
|
||||||
|
release, delete the release and the tag on GitHub, then push the tag again.
|
||||||
|
|||||||
@@ -1,229 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_H
|
|
||||||
#define SDRPLAY_API_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_dev.h"
|
|
||||||
#include "sdrplay_api_rx_channel.h"
|
|
||||||
#include "sdrplay_api_callback.h"
|
|
||||||
|
|
||||||
//#if defined(_M_X64) || defined(_M_IX86)
|
|
||||||
//#include "windows.h"
|
|
||||||
//#elif defined (__GNUC__)
|
|
||||||
typedef void *HANDLE;
|
|
||||||
//#endif
|
|
||||||
|
|
||||||
//#ifndef _SDRPLAY_DLL_QUALIFIER
|
|
||||||
//#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86))
|
|
||||||
//#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
|
|
||||||
//#elif defined(STATIC_LIB) || defined(__GNUC__)
|
|
||||||
//#define _SDRPLAY_DLL_QUALIFIER
|
|
||||||
//#endif
|
|
||||||
//#endif // _SDRPLAY_DLL_QUALIFIER
|
|
||||||
|
|
||||||
// Application code should check that it is compiled against the same API version
|
|
||||||
// sdrplay_api_ApiVersion() returns the API version
|
|
||||||
#define SDRPLAY_API_VERSION (float)(3.07)
|
|
||||||
|
|
||||||
// API Constants
|
|
||||||
#define SDRPLAY_MAX_DEVICES (16)
|
|
||||||
#define SDRPLAY_MAX_TUNERS_PER_DEVICE (2)
|
|
||||||
|
|
||||||
#define SDRPLAY_MAX_SER_NO_LEN (64)
|
|
||||||
#define SDRPLAY_MAX_ROOT_NM_LEN (32)
|
|
||||||
|
|
||||||
#define SDRPLAY_RSP1_ID (1)
|
|
||||||
#define SDRPLAY_RSP1A_ID (255)
|
|
||||||
#define SDRPLAY_RSP2_ID (2)
|
|
||||||
#define SDRPLAY_RSPduo_ID (3)
|
|
||||||
#define SDRPLAY_RSPdx_ID (4)
|
|
||||||
|
|
||||||
// Enum types
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Success = 0,
|
|
||||||
sdrplay_api_Fail = 1,
|
|
||||||
sdrplay_api_InvalidParam = 2,
|
|
||||||
sdrplay_api_OutOfRange = 3,
|
|
||||||
sdrplay_api_GainUpdateError = 4,
|
|
||||||
sdrplay_api_RfUpdateError = 5,
|
|
||||||
sdrplay_api_FsUpdateError = 6,
|
|
||||||
sdrplay_api_HwError = 7,
|
|
||||||
sdrplay_api_AliasingError = 8,
|
|
||||||
sdrplay_api_AlreadyInitialised = 9,
|
|
||||||
sdrplay_api_NotInitialised = 10,
|
|
||||||
sdrplay_api_NotEnabled = 11,
|
|
||||||
sdrplay_api_HwVerError = 12,
|
|
||||||
sdrplay_api_OutOfMemError = 13,
|
|
||||||
sdrplay_api_ServiceNotResponding = 14,
|
|
||||||
sdrplay_api_StartPending = 15,
|
|
||||||
sdrplay_api_StopPending = 16,
|
|
||||||
sdrplay_api_InvalidMode = 17,
|
|
||||||
sdrplay_api_FailedVerification1 = 18,
|
|
||||||
sdrplay_api_FailedVerification2 = 19,
|
|
||||||
sdrplay_api_FailedVerification3 = 20,
|
|
||||||
sdrplay_api_FailedVerification4 = 21,
|
|
||||||
sdrplay_api_FailedVerification5 = 22,
|
|
||||||
sdrplay_api_FailedVerification6 = 23,
|
|
||||||
sdrplay_api_InvalidServiceVersion = 24
|
|
||||||
} sdrplay_api_ErrT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Update_None = 0x00000000,
|
|
||||||
|
|
||||||
// Reasons for master only mode
|
|
||||||
sdrplay_api_Update_Dev_Fs = 0x00000001,
|
|
||||||
sdrplay_api_Update_Dev_Ppm = 0x00000002,
|
|
||||||
sdrplay_api_Update_Dev_SyncUpdate = 0x00000004,
|
|
||||||
sdrplay_api_Update_Dev_ResetFlags = 0x00000008,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Rsp1a_BiasTControl = 0x00000010,
|
|
||||||
sdrplay_api_Update_Rsp1a_RfNotchControl = 0x00000020,
|
|
||||||
sdrplay_api_Update_Rsp1a_RfDabNotchControl = 0x00000040,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Rsp2_BiasTControl = 0x00000080,
|
|
||||||
sdrplay_api_Update_Rsp2_AmPortSelect = 0x00000100,
|
|
||||||
sdrplay_api_Update_Rsp2_AntennaControl = 0x00000200,
|
|
||||||
sdrplay_api_Update_Rsp2_RfNotchControl = 0x00000400,
|
|
||||||
sdrplay_api_Update_Rsp2_ExtRefControl = 0x00000800,
|
|
||||||
|
|
||||||
sdrplay_api_Update_RspDuo_ExtRefControl = 0x00001000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Master_Spare_1 = 0x00002000,
|
|
||||||
sdrplay_api_Update_Master_Spare_2 = 0x00004000,
|
|
||||||
|
|
||||||
// Reasons for master and slave mode
|
|
||||||
// Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
|
|
||||||
sdrplay_api_Update_Tuner_Gr = 0x00008000,
|
|
||||||
sdrplay_api_Update_Tuner_GrLimits = 0x00010000,
|
|
||||||
sdrplay_api_Update_Tuner_Frf = 0x00020000,
|
|
||||||
sdrplay_api_Update_Tuner_BwType = 0x00040000,
|
|
||||||
sdrplay_api_Update_Tuner_IfType = 0x00080000,
|
|
||||||
sdrplay_api_Update_Tuner_DcOffset = 0x00100000,
|
|
||||||
sdrplay_api_Update_Tuner_LoMode = 0x00200000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Ctrl_DCoffsetIQimbalance = 0x00400000,
|
|
||||||
sdrplay_api_Update_Ctrl_Decimation = 0x00800000,
|
|
||||||
sdrplay_api_Update_Ctrl_Agc = 0x01000000,
|
|
||||||
sdrplay_api_Update_Ctrl_AdsbMode = 0x02000000,
|
|
||||||
sdrplay_api_Update_Ctrl_OverloadMsgAck = 0x04000000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_RspDuo_BiasTControl = 0x08000000,
|
|
||||||
sdrplay_api_Update_RspDuo_AmPortSelect = 0x10000000,
|
|
||||||
sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
|
|
||||||
sdrplay_api_Update_RspDuo_RfNotchControl = 0x40000000,
|
|
||||||
sdrplay_api_Update_RspDuo_RfDabNotchControl = 0x80000000,
|
|
||||||
} sdrplay_api_ReasonForUpdateT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Update_Ext1_None = 0x00000000,
|
|
||||||
|
|
||||||
// Reasons for master only mode
|
|
||||||
sdrplay_api_Update_RspDx_HdrEnable = 0x00000001,
|
|
||||||
sdrplay_api_Update_RspDx_BiasTControl = 0x00000002,
|
|
||||||
sdrplay_api_Update_RspDx_AntennaControl = 0x00000004,
|
|
||||||
sdrplay_api_Update_RspDx_RfNotchControl = 0x00000008,
|
|
||||||
sdrplay_api_Update_RspDx_RfDabNotchControl = 0x00000010,
|
|
||||||
sdrplay_api_Update_RspDx_HdrBw = 0x00000020,
|
|
||||||
|
|
||||||
// Reasons for master and slave mode
|
|
||||||
} sdrplay_api_ReasonForUpdateExtension1T;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_DbgLvl_Disable = 0,
|
|
||||||
sdrplay_api_DbgLvl_Verbose = 1,
|
|
||||||
sdrplay_api_DbgLvl_Warning = 2,
|
|
||||||
sdrplay_api_DbgLvl_Error = 3,
|
|
||||||
sdrplay_api_DbgLvl_Message = 4,
|
|
||||||
} sdrplay_api_DbgLvl_t;
|
|
||||||
|
|
||||||
// Device structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char SerNo[SDRPLAY_MAX_SER_NO_LEN];
|
|
||||||
unsigned char hwVer;
|
|
||||||
sdrplay_api_TunerSelectT tuner;
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode;
|
|
||||||
double rspDuoSampleFreq;
|
|
||||||
HANDLE dev;
|
|
||||||
} sdrplay_api_DeviceT;
|
|
||||||
|
|
||||||
// Device parameter structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_DevParamsT *devParams;
|
|
||||||
sdrplay_api_RxChannelParamsT *rxChannelA;
|
|
||||||
sdrplay_api_RxChannelParamsT *rxChannelB;
|
|
||||||
} sdrplay_api_DeviceParamsT;
|
|
||||||
|
|
||||||
// Extended error message structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char file[256];
|
|
||||||
char function[256];
|
|
||||||
int line;
|
|
||||||
char message[1024];
|
|
||||||
} sdrplay_api_ErrorInfoT;
|
|
||||||
|
|
||||||
// Comman API function types
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Open_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Close_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_ApiVersion_t)(float *apiVer);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_LockDeviceApi_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_UnlockDeviceApi_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef const char* (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
|
|
||||||
typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_DisableHeartbeat_t)(void);
|
|
||||||
|
|
||||||
// Device API function types
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Uninit_t)(HANDLE dev);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
|
|
||||||
sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
|
|
||||||
// API function definitions
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Comman API function definitions
|
|
||||||
sdrplay_api_ErrT sdrplay_api_Open(void);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_Close(void);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_ApiVersion(float *apiVer);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_LockDeviceApi(void);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_UnlockDeviceApi(void);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);
|
|
||||||
const char* sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
|
|
||||||
sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
|
|
||||||
|
|
||||||
// Device API function definitions
|
|
||||||
sdrplay_api_ErrT sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_Uninit(HANDLE dev);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate);
|
|
||||||
sdrplay_api_ErrT sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
|
|
||||||
sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_H
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_CALLBACK_H
|
|
||||||
#define SDRPLAY_API_CALLBACK_H
|
|
||||||
|
|
||||||
// Event callback enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Overload_Detected = 0,
|
|
||||||
sdrplay_api_Overload_Corrected = 1,
|
|
||||||
} sdrplay_api_PowerOverloadCbEventIdT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_MasterInitialised = 0,
|
|
||||||
sdrplay_api_SlaveAttached = 1,
|
|
||||||
sdrplay_api_SlaveDetached = 2,
|
|
||||||
sdrplay_api_SlaveInitialised = 3,
|
|
||||||
sdrplay_api_SlaveUninitialised = 4,
|
|
||||||
sdrplay_api_MasterDllDisappeared = 5,
|
|
||||||
sdrplay_api_SlaveDllDisappeared = 6,
|
|
||||||
} sdrplay_api_RspDuoModeCbEventIdT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_GainChange = 0,
|
|
||||||
sdrplay_api_PowerOverloadChange = 1,
|
|
||||||
sdrplay_api_DeviceRemoved = 2,
|
|
||||||
sdrplay_api_RspDuoModeChange = 3,
|
|
||||||
} sdrplay_api_EventT;
|
|
||||||
|
|
||||||
// Event callback parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int gRdB;
|
|
||||||
unsigned int lnaGRdB;
|
|
||||||
double currGain;
|
|
||||||
} sdrplay_api_GainCbParamT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
|
|
||||||
} sdrplay_api_PowerOverloadCbParamT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
|
|
||||||
} sdrplay_api_RspDuoModeCbParamT;
|
|
||||||
|
|
||||||
// Event parameters overlay
|
|
||||||
typedef union
|
|
||||||
{
|
|
||||||
sdrplay_api_GainCbParamT gainParams;
|
|
||||||
sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
|
|
||||||
sdrplay_api_RspDuoModeCbParamT rspDuoModeParams;
|
|
||||||
} sdrplay_api_EventParamsT;
|
|
||||||
|
|
||||||
// Stream callback parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int firstSampleNum;
|
|
||||||
int grChanged;
|
|
||||||
int rfChanged;
|
|
||||||
int fsChanged;
|
|
||||||
unsigned int numSamples;
|
|
||||||
} sdrplay_api_StreamCbParamsT;
|
|
||||||
|
|
||||||
// Callback function prototypes
|
|
||||||
typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext);
|
|
||||||
typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext);
|
|
||||||
|
|
||||||
// Callback function struct
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_StreamCallback_t StreamACbFn;
|
|
||||||
sdrplay_api_StreamCallback_t StreamBCbFn;
|
|
||||||
sdrplay_api_EventCallback_t EventCbFn;
|
|
||||||
} sdrplay_api_CallbackFnsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_CALLBACK_H
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_CONTROL_H
|
|
||||||
#define SDRPLAY_API_CONTROL_H
|
|
||||||
|
|
||||||
// Control parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_AGC_DISABLE = 0,
|
|
||||||
sdrplay_api_AGC_100HZ = 1,
|
|
||||||
sdrplay_api_AGC_50HZ = 2,
|
|
||||||
sdrplay_api_AGC_5HZ = 3,
|
|
||||||
sdrplay_api_AGC_CTRL_EN = 4
|
|
||||||
} sdrplay_api_AgcControlT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_ADSB_DECIMATION = 0,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_LOWPASS = 1,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
|
|
||||||
} sdrplay_api_AdsbModeT;
|
|
||||||
|
|
||||||
// Control parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char DCenable; // default: 1
|
|
||||||
unsigned char IQenable; // default: 1
|
|
||||||
} sdrplay_api_DcOffsetT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char enable; // default: 0
|
|
||||||
unsigned char decimationFactor; // default: 1
|
|
||||||
unsigned char wideBandSignal; // default: 0
|
|
||||||
} sdrplay_api_DecimationT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_AgcControlT enable; // default: sdrplay_api_AGC_50HZ
|
|
||||||
int setPoint_dBfs; // default: -60
|
|
||||||
unsigned short attack_ms; // default: 0
|
|
||||||
unsigned short decay_ms; // default: 0
|
|
||||||
unsigned short decay_delay_ms; // default: 0
|
|
||||||
unsigned short decay_threshold_dB; // default: 0
|
|
||||||
int syncUpdate; // default: 0
|
|
||||||
} sdrplay_api_AgcT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_DcOffsetT dcOffset;
|
|
||||||
sdrplay_api_DecimationT decimation;
|
|
||||||
sdrplay_api_AgcT agc;
|
|
||||||
sdrplay_api_AdsbModeT adsbMode; //default: sdrplay_api_ADSB_DECIMATION
|
|
||||||
} sdrplay_api_ControlParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_CONTROL_H
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_DEV_H
|
|
||||||
#define SDRPLAY_API_DEV_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_rsp1a.h"
|
|
||||||
#include "sdrplay_api_rsp2.h"
|
|
||||||
#include "sdrplay_api_rspDuo.h"
|
|
||||||
#include "sdrplay_api_rspDx.h"
|
|
||||||
|
|
||||||
// Dev parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_ISOCH = 0,
|
|
||||||
sdrplay_api_BULK = 1
|
|
||||||
} sdrplay_api_TransferModeT;
|
|
||||||
|
|
||||||
// Dev parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double fsHz; // default: 2000000.0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
unsigned char reCal; // default: 0
|
|
||||||
} sdrplay_api_FsFreqT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int sampleNum; // default: 0
|
|
||||||
unsigned int period; // default: 0
|
|
||||||
} sdrplay_api_SyncUpdateT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char resetGainUpdate; // default: 0
|
|
||||||
unsigned char resetRfUpdate; // default: 0
|
|
||||||
unsigned char resetFsUpdate; // default: 0
|
|
||||||
} sdrplay_api_ResetFlagsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double ppm; // default: 0.0
|
|
||||||
sdrplay_api_FsFreqT fsFreq;
|
|
||||||
sdrplay_api_SyncUpdateT syncUpdate;
|
|
||||||
sdrplay_api_ResetFlagsT resetFlags;
|
|
||||||
sdrplay_api_TransferModeT mode; // default: sdrplay_api_ISOCH
|
|
||||||
unsigned int samplesPerPkt; // default: 0 (output param)
|
|
||||||
sdrplay_api_Rsp1aParamsT rsp1aParams;
|
|
||||||
sdrplay_api_Rsp2ParamsT rsp2Params;
|
|
||||||
sdrplay_api_RspDuoParamsT rspDuoParams;
|
|
||||||
sdrplay_api_RspDxParamsT rspDxParams;
|
|
||||||
} sdrplay_api_DevParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_DEV_H
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSP1A_H
|
|
||||||
#define SDRPLAY_API_RSP1A_H
|
|
||||||
|
|
||||||
#define RSPIA_NUM_LNA_STATES 10
|
|
||||||
#define RSPIA_NUM_LNA_STATES_AM 7
|
|
||||||
#define RSPIA_NUM_LNA_STATES_LBAND 9
|
|
||||||
|
|
||||||
// RSP1A parameter enums
|
|
||||||
|
|
||||||
// RSP1A parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp1aParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp1aTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSP1A_H
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSP2_H
|
|
||||||
#define SDRPLAY_API_RSP2_H
|
|
||||||
|
|
||||||
#define RSPII_NUM_LNA_STATES 9
|
|
||||||
#define RSPII_NUM_LNA_STATES_AMPORT 5
|
|
||||||
#define RSPII_NUM_LNA_STATES_420MHZ 6
|
|
||||||
|
|
||||||
// RSP2 parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Rsp2_ANTENNA_A = 5,
|
|
||||||
sdrplay_api_Rsp2_ANTENNA_B = 6,
|
|
||||||
} sdrplay_api_Rsp2_AntennaSelectT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Rsp2_AMPORT_1 = 1,
|
|
||||||
sdrplay_api_Rsp2_AMPORT_2 = 0,
|
|
||||||
} sdrplay_api_Rsp2_AmPortSelectT;
|
|
||||||
|
|
||||||
// RSP2 parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char extRefOutputEn; // default: 0
|
|
||||||
} sdrplay_api_Rsp2ParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_Rsp2_AmPortSelectT amPortSel; // default: sdrplay_api_Rsp2_AMPORT_2
|
|
||||||
sdrplay_api_Rsp2_AntennaSelectT antennaSel; // default: sdrplay_api_Rsp2_ANTENNA_A
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp2TunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSP2_H
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSPduo_H
|
|
||||||
#define SDRPLAY_API_RSPduo_H
|
|
||||||
|
|
||||||
#define RSPDUO_NUM_LNA_STATES 10
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_AMPORT 5
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_AM 7
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_LBAND 9
|
|
||||||
|
|
||||||
// RSPduo parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuoMode_Unknown = 0,
|
|
||||||
sdrplay_api_RspDuoMode_Single_Tuner = 1,
|
|
||||||
sdrplay_api_RspDuoMode_Dual_Tuner = 2,
|
|
||||||
sdrplay_api_RspDuoMode_Master = 4,
|
|
||||||
sdrplay_api_RspDuoMode_Slave = 8,
|
|
||||||
} sdrplay_api_RspDuoModeT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuo_AMPORT_1 = 1,
|
|
||||||
sdrplay_api_RspDuo_AMPORT_2 = 0,
|
|
||||||
} sdrplay_api_RspDuo_AmPortSelectT;
|
|
||||||
|
|
||||||
// RSPduo parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int extRefOutputEn; // default: 0
|
|
||||||
} sdrplay_api_RspDuoParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
|
|
||||||
unsigned char tuner1AmNotchEnable; // default: 0
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_RspDuoTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSPduo_H
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSPDX_H
|
|
||||||
#define SDRPLAY_API_RSPDX_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_tuner.h"
|
|
||||||
|
|
||||||
#define RSPDX_NUM_LNA_STATES 28 // Number of LNA states in all bands (except where defined differently below)
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12 19 // Number of LNA states when using AM Port 2 between 0 and 12MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_12_60 20 // Number of LNA states when using AM Port 2 between 12 and 60MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_VHF_BAND3 27 // Number of LNA states in VHF and Band3
|
|
||||||
#define RSPDX_NUM_LNA_STATES_420MHZ 21 // Number of LNA states in 420MHz band
|
|
||||||
#define RSPDX_NUM_LNA_STATES_LBAND 19 // Number of LNA states in L-band
|
|
||||||
#define RSPDX_NUM_LNA_STATES_DX 26 // Number of LNA states in DX path
|
|
||||||
|
|
||||||
// RSPdx parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_ANTENNA_A = 0,
|
|
||||||
sdrplay_api_RspDx_ANTENNA_B = 1,
|
|
||||||
sdrplay_api_RspDx_ANTENNA_C = 2,
|
|
||||||
} sdrplay_api_RspDx_AntennaSelectT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_0_200 = 0,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_0_500 = 1,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_1_200 = 2,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_1_700 = 3,
|
|
||||||
} sdrplay_api_RspDx_HdrModeBwT;
|
|
||||||
|
|
||||||
// RSPdx parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char hdrEnable; // default: 0
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_RspDx_AntennaSelectT antennaSel; // default: sdrplay_api_RspDx_ANTENNA_A
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_RspDxParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_HdrModeBwT hdrBw; // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
|
|
||||||
} sdrplay_api_RspDxTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSPDX_H
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
#define SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_tuner.h"
|
|
||||||
#include "sdrplay_api_control.h"
|
|
||||||
#include "sdrplay_api_rsp1a.h"
|
|
||||||
#include "sdrplay_api_rsp2.h"
|
|
||||||
#include "sdrplay_api_rspDuo.h"
|
|
||||||
#include "sdrplay_api_rspDx.h"
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_TunerParamsT tunerParams;
|
|
||||||
sdrplay_api_ControlParamsT ctrlParams;
|
|
||||||
sdrplay_api_Rsp1aTunerParamsT rsp1aTunerParams;
|
|
||||||
sdrplay_api_Rsp2TunerParamsT rsp2TunerParams;
|
|
||||||
sdrplay_api_RspDuoTunerParamsT rspDuoTunerParams;
|
|
||||||
sdrplay_api_RspDxTunerParamsT rspDxTunerParams;
|
|
||||||
} sdrplay_api_RxChannelParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_TUNER_H
|
|
||||||
#define SDRPLAY_API_TUNER_H
|
|
||||||
|
|
||||||
#define MAX_BB_GR (59)
|
|
||||||
|
|
||||||
// Tuner parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_BW_Undefined = 0,
|
|
||||||
sdrplay_api_BW_0_200 = 200,
|
|
||||||
sdrplay_api_BW_0_300 = 300,
|
|
||||||
sdrplay_api_BW_0_600 = 600,
|
|
||||||
sdrplay_api_BW_1_536 = 1536,
|
|
||||||
sdrplay_api_BW_5_000 = 5000,
|
|
||||||
sdrplay_api_BW_6_000 = 6000,
|
|
||||||
sdrplay_api_BW_7_000 = 7000,
|
|
||||||
sdrplay_api_BW_8_000 = 8000
|
|
||||||
} sdrplay_api_Bw_MHzT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_IF_Undefined = -1,
|
|
||||||
sdrplay_api_IF_Zero = 0,
|
|
||||||
sdrplay_api_IF_0_450 = 450,
|
|
||||||
sdrplay_api_IF_1_620 = 1620,
|
|
||||||
sdrplay_api_IF_2_048 = 2048
|
|
||||||
} sdrplay_api_If_kHzT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_LO_Undefined = 0,
|
|
||||||
sdrplay_api_LO_Auto = 1,
|
|
||||||
sdrplay_api_LO_120MHz = 2,
|
|
||||||
sdrplay_api_LO_144MHz = 3,
|
|
||||||
sdrplay_api_LO_168MHz = 4
|
|
||||||
} sdrplay_api_LoModeT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_EXTENDED_MIN_GR = 0,
|
|
||||||
sdrplay_api_NORMAL_MIN_GR = 20
|
|
||||||
} sdrplay_api_MinGainReductionT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Tuner_Neither = 0,
|
|
||||||
sdrplay_api_Tuner_A = 1,
|
|
||||||
sdrplay_api_Tuner_B = 2,
|
|
||||||
sdrplay_api_Tuner_Both = 3,
|
|
||||||
} sdrplay_api_TunerSelectT;
|
|
||||||
|
|
||||||
// Tuner parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
float curr;
|
|
||||||
float max;
|
|
||||||
float min;
|
|
||||||
} sdrplay_api_GainValuesT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int gRdB; // default: 50
|
|
||||||
unsigned char LNAstate; // default: 0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
|
|
||||||
sdrplay_api_GainValuesT gainVals; // output parameter
|
|
||||||
} sdrplay_api_GainT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double rfHz; // default: 200000000.0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
} sdrplay_api_RfFreqT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char dcCal; // default: 3 (Periodic mode)
|
|
||||||
unsigned char speedUp; // default: 0 (No speedup)
|
|
||||||
int trackTime; // default: 1 (=> time in uSec = (72 * 3 * trackTime) / 24e6 = 9uSec)
|
|
||||||
int refreshRateTime; // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
|
|
||||||
} sdrplay_api_DcOffsetTunerT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_Bw_MHzT bwType; // default: sdrplay_api_BW_0_200
|
|
||||||
sdrplay_api_If_kHzT ifType; // default: sdrplay_api_IF_Zero
|
|
||||||
sdrplay_api_LoModeT loMode; // default: sdrplay_api_LO_Auto
|
|
||||||
sdrplay_api_GainT gain;
|
|
||||||
sdrplay_api_RfFreqT rfFreq;
|
|
||||||
sdrplay_api_DcOffsetTunerT dcOffsetTuner;
|
|
||||||
} sdrplay_api_TunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_TUNER_H
|
|
||||||
@@ -1,230 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_H
|
|
||||||
#define SDRPLAY_API_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_dev.h"
|
|
||||||
#include "sdrplay_api_rx_channel.h"
|
|
||||||
#include "sdrplay_api_callback.h"
|
|
||||||
|
|
||||||
//#if defined(_M_X64) || defined(_M_IX86)
|
|
||||||
//#include "windows.h"
|
|
||||||
//#elif defined (__GNUC__)
|
|
||||||
typedef void *HANDLE;
|
|
||||||
//#endif
|
|
||||||
//
|
|
||||||
//#ifndef _SDRPLAY_DLL_QUALIFIER
|
|
||||||
//#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86))
|
|
||||||
//#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
|
|
||||||
//#elif defined(STATIC_LIB) || defined(__GNUC__)
|
|
||||||
//#define _SDRPLAY_DLL_QUALIFIER
|
|
||||||
//#endif
|
|
||||||
//#endif // _SDRPLAY_DLL_QUALIFIER
|
|
||||||
|
|
||||||
// Application code should check that it is compiled against the same API version
|
|
||||||
// sdrplay_api_ApiVersion() returns the API version
|
|
||||||
#define SDRPLAY_API_VERSION (float)(3.08)
|
|
||||||
|
|
||||||
// API Constants
|
|
||||||
#define SDRPLAY_MAX_DEVICES (16)
|
|
||||||
#define SDRPLAY_MAX_TUNERS_PER_DEVICE (2)
|
|
||||||
|
|
||||||
#define SDRPLAY_MAX_SER_NO_LEN (64)
|
|
||||||
#define SDRPLAY_MAX_ROOT_NM_LEN (32)
|
|
||||||
|
|
||||||
#define SDRPLAY_RSP1_ID (1)
|
|
||||||
#define SDRPLAY_RSP1A_ID (255)
|
|
||||||
#define SDRPLAY_RSP2_ID (2)
|
|
||||||
#define SDRPLAY_RSPduo_ID (3)
|
|
||||||
#define SDRPLAY_RSPdx_ID (4)
|
|
||||||
|
|
||||||
// Enum types
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Success = 0,
|
|
||||||
sdrplay_api_Fail = 1,
|
|
||||||
sdrplay_api_InvalidParam = 2,
|
|
||||||
sdrplay_api_OutOfRange = 3,
|
|
||||||
sdrplay_api_GainUpdateError = 4,
|
|
||||||
sdrplay_api_RfUpdateError = 5,
|
|
||||||
sdrplay_api_FsUpdateError = 6,
|
|
||||||
sdrplay_api_HwError = 7,
|
|
||||||
sdrplay_api_AliasingError = 8,
|
|
||||||
sdrplay_api_AlreadyInitialised = 9,
|
|
||||||
sdrplay_api_NotInitialised = 10,
|
|
||||||
sdrplay_api_NotEnabled = 11,
|
|
||||||
sdrplay_api_HwVerError = 12,
|
|
||||||
sdrplay_api_OutOfMemError = 13,
|
|
||||||
sdrplay_api_ServiceNotResponding = 14,
|
|
||||||
sdrplay_api_StartPending = 15,
|
|
||||||
sdrplay_api_StopPending = 16,
|
|
||||||
sdrplay_api_InvalidMode = 17,
|
|
||||||
sdrplay_api_FailedVerification1 = 18,
|
|
||||||
sdrplay_api_FailedVerification2 = 19,
|
|
||||||
sdrplay_api_FailedVerification3 = 20,
|
|
||||||
sdrplay_api_FailedVerification4 = 21,
|
|
||||||
sdrplay_api_FailedVerification5 = 22,
|
|
||||||
sdrplay_api_FailedVerification6 = 23,
|
|
||||||
sdrplay_api_InvalidServiceVersion = 24
|
|
||||||
} sdrplay_api_ErrT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Update_None = 0x00000000,
|
|
||||||
|
|
||||||
// Reasons for master only mode
|
|
||||||
sdrplay_api_Update_Dev_Fs = 0x00000001,
|
|
||||||
sdrplay_api_Update_Dev_Ppm = 0x00000002,
|
|
||||||
sdrplay_api_Update_Dev_SyncUpdate = 0x00000004,
|
|
||||||
sdrplay_api_Update_Dev_ResetFlags = 0x00000008,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Rsp1a_BiasTControl = 0x00000010,
|
|
||||||
sdrplay_api_Update_Rsp1a_RfNotchControl = 0x00000020,
|
|
||||||
sdrplay_api_Update_Rsp1a_RfDabNotchControl = 0x00000040,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Rsp2_BiasTControl = 0x00000080,
|
|
||||||
sdrplay_api_Update_Rsp2_AmPortSelect = 0x00000100,
|
|
||||||
sdrplay_api_Update_Rsp2_AntennaControl = 0x00000200,
|
|
||||||
sdrplay_api_Update_Rsp2_RfNotchControl = 0x00000400,
|
|
||||||
sdrplay_api_Update_Rsp2_ExtRefControl = 0x00000800,
|
|
||||||
|
|
||||||
sdrplay_api_Update_RspDuo_ExtRefControl = 0x00001000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Master_Spare_1 = 0x00002000,
|
|
||||||
sdrplay_api_Update_Master_Spare_2 = 0x00004000,
|
|
||||||
|
|
||||||
// Reasons for master and slave mode
|
|
||||||
// Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
|
|
||||||
sdrplay_api_Update_Tuner_Gr = 0x00008000,
|
|
||||||
sdrplay_api_Update_Tuner_GrLimits = 0x00010000,
|
|
||||||
sdrplay_api_Update_Tuner_Frf = 0x00020000,
|
|
||||||
sdrplay_api_Update_Tuner_BwType = 0x00040000,
|
|
||||||
sdrplay_api_Update_Tuner_IfType = 0x00080000,
|
|
||||||
sdrplay_api_Update_Tuner_DcOffset = 0x00100000,
|
|
||||||
sdrplay_api_Update_Tuner_LoMode = 0x00200000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Ctrl_DCoffsetIQimbalance = 0x00400000,
|
|
||||||
sdrplay_api_Update_Ctrl_Decimation = 0x00800000,
|
|
||||||
sdrplay_api_Update_Ctrl_Agc = 0x01000000,
|
|
||||||
sdrplay_api_Update_Ctrl_AdsbMode = 0x02000000,
|
|
||||||
sdrplay_api_Update_Ctrl_OverloadMsgAck = 0x04000000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_RspDuo_BiasTControl = 0x08000000,
|
|
||||||
sdrplay_api_Update_RspDuo_AmPortSelect = 0x10000000,
|
|
||||||
sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
|
|
||||||
sdrplay_api_Update_RspDuo_RfNotchControl = 0x40000000,
|
|
||||||
sdrplay_api_Update_RspDuo_RfDabNotchControl = 0x80000000,
|
|
||||||
} sdrplay_api_ReasonForUpdateT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Update_Ext1_None = 0x00000000,
|
|
||||||
|
|
||||||
// Reasons for master only mode
|
|
||||||
sdrplay_api_Update_RspDx_HdrEnable = 0x00000001,
|
|
||||||
sdrplay_api_Update_RspDx_BiasTControl = 0x00000002,
|
|
||||||
sdrplay_api_Update_RspDx_AntennaControl = 0x00000004,
|
|
||||||
sdrplay_api_Update_RspDx_RfNotchControl = 0x00000008,
|
|
||||||
sdrplay_api_Update_RspDx_RfDabNotchControl = 0x00000010,
|
|
||||||
sdrplay_api_Update_RspDx_HdrBw = 0x00000020,
|
|
||||||
|
|
||||||
// Reasons for master and slave mode
|
|
||||||
} sdrplay_api_ReasonForUpdateExtension1T;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_DbgLvl_Disable = 0,
|
|
||||||
sdrplay_api_DbgLvl_Verbose = 1,
|
|
||||||
sdrplay_api_DbgLvl_Warning = 2,
|
|
||||||
sdrplay_api_DbgLvl_Error = 3,
|
|
||||||
sdrplay_api_DbgLvl_Message = 4,
|
|
||||||
} sdrplay_api_DbgLvl_t;
|
|
||||||
|
|
||||||
// Device structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char SerNo[SDRPLAY_MAX_SER_NO_LEN];
|
|
||||||
unsigned char hwVer;
|
|
||||||
sdrplay_api_TunerSelectT tuner;
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode;
|
|
||||||
unsigned char valid;
|
|
||||||
double rspDuoSampleFreq;
|
|
||||||
HANDLE dev;
|
|
||||||
} sdrplay_api_DeviceT;
|
|
||||||
|
|
||||||
// Device parameter structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_DevParamsT *devParams;
|
|
||||||
sdrplay_api_RxChannelParamsT *rxChannelA;
|
|
||||||
sdrplay_api_RxChannelParamsT *rxChannelB;
|
|
||||||
} sdrplay_api_DeviceParamsT;
|
|
||||||
|
|
||||||
// Extended error message structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char file[256];
|
|
||||||
char function[256];
|
|
||||||
int line;
|
|
||||||
char message[1024];
|
|
||||||
} sdrplay_api_ErrorInfoT;
|
|
||||||
|
|
||||||
// Comman API function types
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Open_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Close_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_ApiVersion_t)(float *apiVer);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_LockDeviceApi_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_UnlockDeviceApi_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef const char* (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
|
|
||||||
typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_DisableHeartbeat_t)(void);
|
|
||||||
|
|
||||||
// Device API function types
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Uninit_t)(HANDLE dev);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate, double newSampleRate);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
|
|
||||||
sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
|
|
||||||
// API function definitions
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// // Comman API function definitions
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Open(void);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Close(void);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_ApiVersion(float *apiVer);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_LockDeviceApi(void);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_UnlockDeviceApi(void);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER const char* sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
|
|
||||||
//
|
|
||||||
// // Device API function definitions
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Uninit(HANDLE dev);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate, double newSampleRate);
|
|
||||||
// _SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
|
|
||||||
// sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
|
|
||||||
// sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_H
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_CALLBACK_H
|
|
||||||
#define SDRPLAY_API_CALLBACK_H
|
|
||||||
|
|
||||||
// Event callback enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Overload_Detected = 0,
|
|
||||||
sdrplay_api_Overload_Corrected = 1,
|
|
||||||
} sdrplay_api_PowerOverloadCbEventIdT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_MasterInitialised = 0,
|
|
||||||
sdrplay_api_SlaveAttached = 1,
|
|
||||||
sdrplay_api_SlaveDetached = 2,
|
|
||||||
sdrplay_api_SlaveInitialised = 3,
|
|
||||||
sdrplay_api_SlaveUninitialised = 4,
|
|
||||||
sdrplay_api_MasterDllDisappeared = 5,
|
|
||||||
sdrplay_api_SlaveDllDisappeared = 6,
|
|
||||||
} sdrplay_api_RspDuoModeCbEventIdT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_GainChange = 0,
|
|
||||||
sdrplay_api_PowerOverloadChange = 1,
|
|
||||||
sdrplay_api_DeviceRemoved = 2,
|
|
||||||
sdrplay_api_RspDuoModeChange = 3,
|
|
||||||
} sdrplay_api_EventT;
|
|
||||||
|
|
||||||
// Event callback parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int gRdB;
|
|
||||||
unsigned int lnaGRdB;
|
|
||||||
double currGain;
|
|
||||||
} sdrplay_api_GainCbParamT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
|
|
||||||
} sdrplay_api_PowerOverloadCbParamT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
|
|
||||||
} sdrplay_api_RspDuoModeCbParamT;
|
|
||||||
|
|
||||||
// Event parameters overlay
|
|
||||||
typedef union
|
|
||||||
{
|
|
||||||
sdrplay_api_GainCbParamT gainParams;
|
|
||||||
sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
|
|
||||||
sdrplay_api_RspDuoModeCbParamT rspDuoModeParams;
|
|
||||||
} sdrplay_api_EventParamsT;
|
|
||||||
|
|
||||||
// Stream callback parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int firstSampleNum;
|
|
||||||
int grChanged;
|
|
||||||
int rfChanged;
|
|
||||||
int fsChanged;
|
|
||||||
unsigned int numSamples;
|
|
||||||
} sdrplay_api_StreamCbParamsT;
|
|
||||||
|
|
||||||
// Callback function prototypes
|
|
||||||
typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext);
|
|
||||||
typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext);
|
|
||||||
|
|
||||||
// Callback function struct
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_StreamCallback_t StreamACbFn;
|
|
||||||
sdrplay_api_StreamCallback_t StreamBCbFn;
|
|
||||||
sdrplay_api_EventCallback_t EventCbFn;
|
|
||||||
} sdrplay_api_CallbackFnsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_CALLBACK_H
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_CONTROL_H
|
|
||||||
#define SDRPLAY_API_CONTROL_H
|
|
||||||
|
|
||||||
// Control parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_AGC_DISABLE = 0,
|
|
||||||
sdrplay_api_AGC_100HZ = 1,
|
|
||||||
sdrplay_api_AGC_50HZ = 2,
|
|
||||||
sdrplay_api_AGC_5HZ = 3,
|
|
||||||
sdrplay_api_AGC_CTRL_EN = 4
|
|
||||||
} sdrplay_api_AgcControlT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_ADSB_DECIMATION = 0,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_LOWPASS = 1,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
|
|
||||||
} sdrplay_api_AdsbModeT;
|
|
||||||
|
|
||||||
// Control parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char DCenable; // default: 1
|
|
||||||
unsigned char IQenable; // default: 1
|
|
||||||
} sdrplay_api_DcOffsetT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char enable; // default: 0
|
|
||||||
unsigned char decimationFactor; // default: 1
|
|
||||||
unsigned char wideBandSignal; // default: 0
|
|
||||||
} sdrplay_api_DecimationT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_AgcControlT enable; // default: sdrplay_api_AGC_50HZ
|
|
||||||
int setPoint_dBfs; // default: -60
|
|
||||||
unsigned short attack_ms; // default: 0
|
|
||||||
unsigned short decay_ms; // default: 0
|
|
||||||
unsigned short decay_delay_ms; // default: 0
|
|
||||||
unsigned short decay_threshold_dB; // default: 0
|
|
||||||
int syncUpdate; // default: 0
|
|
||||||
} sdrplay_api_AgcT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_DcOffsetT dcOffset;
|
|
||||||
sdrplay_api_DecimationT decimation;
|
|
||||||
sdrplay_api_AgcT agc;
|
|
||||||
sdrplay_api_AdsbModeT adsbMode; //default: sdrplay_api_ADSB_DECIMATION
|
|
||||||
} sdrplay_api_ControlParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_CONTROL_H
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_DEV_H
|
|
||||||
#define SDRPLAY_API_DEV_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_rsp1a.h"
|
|
||||||
#include "sdrplay_api_rsp2.h"
|
|
||||||
#include "sdrplay_api_rspDuo.h"
|
|
||||||
#include "sdrplay_api_rspDx.h"
|
|
||||||
|
|
||||||
// Dev parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_ISOCH = 0,
|
|
||||||
sdrplay_api_BULK = 1
|
|
||||||
} sdrplay_api_TransferModeT;
|
|
||||||
|
|
||||||
// Dev parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double fsHz; // default: 2000000.0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
unsigned char reCal; // default: 0
|
|
||||||
} sdrplay_api_FsFreqT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int sampleNum; // default: 0
|
|
||||||
unsigned int period; // default: 0
|
|
||||||
} sdrplay_api_SyncUpdateT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char resetGainUpdate; // default: 0
|
|
||||||
unsigned char resetRfUpdate; // default: 0
|
|
||||||
unsigned char resetFsUpdate; // default: 0
|
|
||||||
} sdrplay_api_ResetFlagsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double ppm; // default: 0.0
|
|
||||||
sdrplay_api_FsFreqT fsFreq;
|
|
||||||
sdrplay_api_SyncUpdateT syncUpdate;
|
|
||||||
sdrplay_api_ResetFlagsT resetFlags;
|
|
||||||
sdrplay_api_TransferModeT mode; // default: sdrplay_api_ISOCH
|
|
||||||
unsigned int samplesPerPkt; // default: 0 (output param)
|
|
||||||
sdrplay_api_Rsp1aParamsT rsp1aParams;
|
|
||||||
sdrplay_api_Rsp2ParamsT rsp2Params;
|
|
||||||
sdrplay_api_RspDuoParamsT rspDuoParams;
|
|
||||||
sdrplay_api_RspDxParamsT rspDxParams;
|
|
||||||
} sdrplay_api_DevParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_DEV_H
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSP1A_H
|
|
||||||
#define SDRPLAY_API_RSP1A_H
|
|
||||||
|
|
||||||
#define RSPIA_NUM_LNA_STATES 10
|
|
||||||
#define RSPIA_NUM_LNA_STATES_AM 7
|
|
||||||
#define RSPIA_NUM_LNA_STATES_LBAND 9
|
|
||||||
|
|
||||||
// RSP1A parameter enums
|
|
||||||
|
|
||||||
// RSP1A parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp1aParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp1aTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSP1A_H
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSP2_H
|
|
||||||
#define SDRPLAY_API_RSP2_H
|
|
||||||
|
|
||||||
#define RSPII_NUM_LNA_STATES 9
|
|
||||||
#define RSPII_NUM_LNA_STATES_AMPORT 5
|
|
||||||
#define RSPII_NUM_LNA_STATES_420MHZ 6
|
|
||||||
|
|
||||||
// RSP2 parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Rsp2_ANTENNA_A = 5,
|
|
||||||
sdrplay_api_Rsp2_ANTENNA_B = 6,
|
|
||||||
} sdrplay_api_Rsp2_AntennaSelectT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Rsp2_AMPORT_1 = 1,
|
|
||||||
sdrplay_api_Rsp2_AMPORT_2 = 0,
|
|
||||||
} sdrplay_api_Rsp2_AmPortSelectT;
|
|
||||||
|
|
||||||
// RSP2 parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char extRefOutputEn; // default: 0
|
|
||||||
} sdrplay_api_Rsp2ParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_Rsp2_AmPortSelectT amPortSel; // default: sdrplay_api_Rsp2_AMPORT_2
|
|
||||||
sdrplay_api_Rsp2_AntennaSelectT antennaSel; // default: sdrplay_api_Rsp2_ANTENNA_A
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp2TunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSP2_H
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSPduo_H
|
|
||||||
#define SDRPLAY_API_RSPduo_H
|
|
||||||
|
|
||||||
#define RSPDUO_NUM_LNA_STATES 10
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_AMPORT 5
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_AM 7
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_LBAND 9
|
|
||||||
|
|
||||||
// RSPduo parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuoMode_Unknown = 0,
|
|
||||||
sdrplay_api_RspDuoMode_Single_Tuner = 1,
|
|
||||||
sdrplay_api_RspDuoMode_Dual_Tuner = 2,
|
|
||||||
sdrplay_api_RspDuoMode_Master = 4,
|
|
||||||
sdrplay_api_RspDuoMode_Slave = 8,
|
|
||||||
} sdrplay_api_RspDuoModeT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuo_AMPORT_1 = 1,
|
|
||||||
sdrplay_api_RspDuo_AMPORT_2 = 0,
|
|
||||||
} sdrplay_api_RspDuo_AmPortSelectT;
|
|
||||||
|
|
||||||
// RSPduo parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int extRefOutputEn; // default: 0
|
|
||||||
} sdrplay_api_RspDuoParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
|
|
||||||
unsigned char tuner1AmNotchEnable; // default: 0
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_RspDuoTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSPduo_H
|
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSPDX_H
|
|
||||||
#define SDRPLAY_API_RSPDX_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_tuner.h"
|
|
||||||
|
|
||||||
#define RSPDX_NUM_LNA_STATES 28 // Number of LNA states in all bands (except where defined differently below)
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12 19 // Number of LNA states when using AM Port 2 between 0 and 12MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_12_60 20 // Number of LNA states when using AM Port 2 between 12 and 60MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_VHF_BAND3 27 // Number of LNA states in VHF and Band3
|
|
||||||
#define RSPDX_NUM_LNA_STATES_420MHZ 21 // Number of LNA states in 420MHz band
|
|
||||||
#define RSPDX_NUM_LNA_STATES_LBAND 19 // Number of LNA states in L-band
|
|
||||||
#define RSPDX_NUM_LNA_STATES_DX 26 // Number of LNA states in DX path
|
|
||||||
|
|
||||||
// RSPdx parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_ANTENNA_A = 0,
|
|
||||||
sdrplay_api_RspDx_ANTENNA_B = 1,
|
|
||||||
sdrplay_api_RspDx_ANTENNA_C = 2,
|
|
||||||
} sdrplay_api_RspDx_AntennaSelectT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_0_200 = 0,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_0_500 = 1,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_1_200 = 2,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_1_700 = 3,
|
|
||||||
} sdrplay_api_RspDx_HdrModeBwT;
|
|
||||||
|
|
||||||
// RSPdx parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char hdrEnable; // default: 0
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_RspDx_AntennaSelectT antennaSel; // default: sdrplay_api_RspDx_ANTENNA_A
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_RspDxParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_HdrModeBwT hdrBw; // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
|
|
||||||
} sdrplay_api_RspDxTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSPDX_H
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
#define SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_tuner.h"
|
|
||||||
#include "sdrplay_api_control.h"
|
|
||||||
#include "sdrplay_api_rsp1a.h"
|
|
||||||
#include "sdrplay_api_rsp2.h"
|
|
||||||
#include "sdrplay_api_rspDuo.h"
|
|
||||||
#include "sdrplay_api_rspDx.h"
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_TunerParamsT tunerParams;
|
|
||||||
sdrplay_api_ControlParamsT ctrlParams;
|
|
||||||
sdrplay_api_Rsp1aTunerParamsT rsp1aTunerParams;
|
|
||||||
sdrplay_api_Rsp2TunerParamsT rsp2TunerParams;
|
|
||||||
sdrplay_api_RspDuoTunerParamsT rspDuoTunerParams;
|
|
||||||
sdrplay_api_RspDxTunerParamsT rspDxTunerParams;
|
|
||||||
} sdrplay_api_RxChannelParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_TUNER_H
|
|
||||||
#define SDRPLAY_API_TUNER_H
|
|
||||||
|
|
||||||
#define MAX_BB_GR (59)
|
|
||||||
|
|
||||||
// Tuner parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_BW_Undefined = 0,
|
|
||||||
sdrplay_api_BW_0_200 = 200,
|
|
||||||
sdrplay_api_BW_0_300 = 300,
|
|
||||||
sdrplay_api_BW_0_600 = 600,
|
|
||||||
sdrplay_api_BW_1_536 = 1536,
|
|
||||||
sdrplay_api_BW_5_000 = 5000,
|
|
||||||
sdrplay_api_BW_6_000 = 6000,
|
|
||||||
sdrplay_api_BW_7_000 = 7000,
|
|
||||||
sdrplay_api_BW_8_000 = 8000
|
|
||||||
} sdrplay_api_Bw_MHzT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_IF_Undefined = -1,
|
|
||||||
sdrplay_api_IF_Zero = 0,
|
|
||||||
sdrplay_api_IF_0_450 = 450,
|
|
||||||
sdrplay_api_IF_1_620 = 1620,
|
|
||||||
sdrplay_api_IF_2_048 = 2048
|
|
||||||
} sdrplay_api_If_kHzT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_LO_Undefined = 0,
|
|
||||||
sdrplay_api_LO_Auto = 1,
|
|
||||||
sdrplay_api_LO_120MHz = 2,
|
|
||||||
sdrplay_api_LO_144MHz = 3,
|
|
||||||
sdrplay_api_LO_168MHz = 4
|
|
||||||
} sdrplay_api_LoModeT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_EXTENDED_MIN_GR = 0,
|
|
||||||
sdrplay_api_NORMAL_MIN_GR = 20
|
|
||||||
} sdrplay_api_MinGainReductionT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Tuner_Neither = 0,
|
|
||||||
sdrplay_api_Tuner_A = 1,
|
|
||||||
sdrplay_api_Tuner_B = 2,
|
|
||||||
sdrplay_api_Tuner_Both = 3,
|
|
||||||
} sdrplay_api_TunerSelectT;
|
|
||||||
|
|
||||||
// Tuner parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
float curr;
|
|
||||||
float max;
|
|
||||||
float min;
|
|
||||||
} sdrplay_api_GainValuesT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int gRdB; // default: 50
|
|
||||||
unsigned char LNAstate; // default: 0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
|
|
||||||
sdrplay_api_GainValuesT gainVals; // output parameter
|
|
||||||
} sdrplay_api_GainT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double rfHz; // default: 200000000.0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
} sdrplay_api_RfFreqT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char dcCal; // default: 3 (Periodic mode)
|
|
||||||
unsigned char speedUp; // default: 0 (No speedup)
|
|
||||||
int trackTime; // default: 1 (=> time in uSec = (72 * 3 * trackTime) / 24e6 = 9uSec)
|
|
||||||
int refreshRateTime; // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
|
|
||||||
} sdrplay_api_DcOffsetTunerT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_Bw_MHzT bwType; // default: sdrplay_api_BW_0_200
|
|
||||||
sdrplay_api_If_kHzT ifType; // default: sdrplay_api_IF_Zero
|
|
||||||
sdrplay_api_LoModeT loMode; // default: sdrplay_api_LO_Auto
|
|
||||||
sdrplay_api_GainT gain;
|
|
||||||
sdrplay_api_RfFreqT rfFreq;
|
|
||||||
sdrplay_api_DcOffsetTunerT dcOffsetTuner;
|
|
||||||
} sdrplay_api_TunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_TUNER_H
|
|
||||||
@@ -1,235 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_H
|
|
||||||
#define SDRPLAY_API_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_dev.h"
|
|
||||||
#include "sdrplay_api_rx_channel.h"
|
|
||||||
#include "sdrplay_api_callback.h"
|
|
||||||
|
|
||||||
#if defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64)
|
|
||||||
#include "windows.h"
|
|
||||||
#elif defined (__GNUC__)
|
|
||||||
typedef void *HANDLE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef _SDRPLAY_DLL_QUALIFIER
|
|
||||||
#if !defined(STATIC_LIB) && (defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64))
|
|
||||||
#define _SDRPLAY_DLL_QUALIFIER __declspec(dllimport)
|
|
||||||
#elif defined(STATIC_LIB) || defined(__GNUC__)
|
|
||||||
#define _SDRPLAY_DLL_QUALIFIER
|
|
||||||
#endif
|
|
||||||
#endif // _SDRPLAY_DLL_QUALIFIER
|
|
||||||
|
|
||||||
// Application code should check that it is compiled against the same API version
|
|
||||||
// sdrplay_api_ApiVersion() returns the API version
|
|
||||||
#define SDRPLAY_API_VERSION (float)(3.15)
|
|
||||||
|
|
||||||
// API Constants
|
|
||||||
#define SDRPLAY_MAX_DEVICES (16)
|
|
||||||
#define SDRPLAY_MAX_TUNERS_PER_DEVICE (2)
|
|
||||||
|
|
||||||
#define SDRPLAY_MAX_SER_NO_LEN (64)
|
|
||||||
#define SDRPLAY_MAX_ROOT_NM_LEN (32)
|
|
||||||
|
|
||||||
#define SDRPLAY_RSP1_ID (1)
|
|
||||||
#define SDRPLAY_RSP1A_ID (255)
|
|
||||||
#define SDRPLAY_RSP2_ID (2)
|
|
||||||
#define SDRPLAY_RSPduo_ID (3)
|
|
||||||
#define SDRPLAY_RSPdx_ID (4)
|
|
||||||
#define SDRPLAY_RSP1B_ID (6)
|
|
||||||
#define SDRPLAY_RSPdxR2_ID (7)
|
|
||||||
|
|
||||||
// Enum types
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Success = 0,
|
|
||||||
sdrplay_api_Fail = 1,
|
|
||||||
sdrplay_api_InvalidParam = 2,
|
|
||||||
sdrplay_api_OutOfRange = 3,
|
|
||||||
sdrplay_api_GainUpdateError = 4,
|
|
||||||
sdrplay_api_RfUpdateError = 5,
|
|
||||||
sdrplay_api_FsUpdateError = 6,
|
|
||||||
sdrplay_api_HwError = 7,
|
|
||||||
sdrplay_api_AliasingError = 8,
|
|
||||||
sdrplay_api_AlreadyInitialised = 9,
|
|
||||||
sdrplay_api_NotInitialised = 10,
|
|
||||||
sdrplay_api_NotEnabled = 11,
|
|
||||||
sdrplay_api_HwVerError = 12,
|
|
||||||
sdrplay_api_OutOfMemError = 13,
|
|
||||||
sdrplay_api_ServiceNotResponding = 14,
|
|
||||||
sdrplay_api_StartPending = 15,
|
|
||||||
sdrplay_api_StopPending = 16,
|
|
||||||
sdrplay_api_InvalidMode = 17,
|
|
||||||
sdrplay_api_FailedVerification1 = 18,
|
|
||||||
sdrplay_api_FailedVerification2 = 19,
|
|
||||||
sdrplay_api_FailedVerification3 = 20,
|
|
||||||
sdrplay_api_FailedVerification4 = 21,
|
|
||||||
sdrplay_api_FailedVerification5 = 22,
|
|
||||||
sdrplay_api_FailedVerification6 = 23,
|
|
||||||
sdrplay_api_InvalidServiceVersion = 24
|
|
||||||
} sdrplay_api_ErrT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Update_None = 0x00000000,
|
|
||||||
|
|
||||||
// Reasons for master only mode
|
|
||||||
sdrplay_api_Update_Dev_Fs = 0x00000001,
|
|
||||||
sdrplay_api_Update_Dev_Ppm = 0x00000002,
|
|
||||||
sdrplay_api_Update_Dev_SyncUpdate = 0x00000004,
|
|
||||||
sdrplay_api_Update_Dev_ResetFlags = 0x00000008,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Rsp1a_BiasTControl = 0x00000010,
|
|
||||||
sdrplay_api_Update_Rsp1a_RfNotchControl = 0x00000020,
|
|
||||||
sdrplay_api_Update_Rsp1a_RfDabNotchControl = 0x00000040,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Rsp2_BiasTControl = 0x00000080,
|
|
||||||
sdrplay_api_Update_Rsp2_AmPortSelect = 0x00000100,
|
|
||||||
sdrplay_api_Update_Rsp2_AntennaControl = 0x00000200,
|
|
||||||
sdrplay_api_Update_Rsp2_RfNotchControl = 0x00000400,
|
|
||||||
sdrplay_api_Update_Rsp2_ExtRefControl = 0x00000800,
|
|
||||||
|
|
||||||
sdrplay_api_Update_RspDuo_ExtRefControl = 0x00001000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Master_Spare_1 = 0x00002000,
|
|
||||||
sdrplay_api_Update_Master_Spare_2 = 0x00004000,
|
|
||||||
|
|
||||||
// Reasons for master and slave mode
|
|
||||||
// Note: sdrplay_api_Update_Tuner_Gr MUST be the first value defined in this section!
|
|
||||||
sdrplay_api_Update_Tuner_Gr = 0x00008000,
|
|
||||||
sdrplay_api_Update_Tuner_GrLimits = 0x00010000,
|
|
||||||
sdrplay_api_Update_Tuner_Frf = 0x00020000,
|
|
||||||
sdrplay_api_Update_Tuner_BwType = 0x00040000,
|
|
||||||
sdrplay_api_Update_Tuner_IfType = 0x00080000,
|
|
||||||
sdrplay_api_Update_Tuner_DcOffset = 0x00100000,
|
|
||||||
sdrplay_api_Update_Tuner_LoMode = 0x00200000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_Ctrl_DCoffsetIQimbalance = 0x00400000,
|
|
||||||
sdrplay_api_Update_Ctrl_Decimation = 0x00800000,
|
|
||||||
sdrplay_api_Update_Ctrl_Agc = 0x01000000,
|
|
||||||
sdrplay_api_Update_Ctrl_AdsbMode = 0x02000000,
|
|
||||||
sdrplay_api_Update_Ctrl_OverloadMsgAck = 0x04000000,
|
|
||||||
|
|
||||||
sdrplay_api_Update_RspDuo_BiasTControl = 0x08000000,
|
|
||||||
sdrplay_api_Update_RspDuo_AmPortSelect = 0x10000000,
|
|
||||||
sdrplay_api_Update_RspDuo_Tuner1AmNotchControl = 0x20000000,
|
|
||||||
sdrplay_api_Update_RspDuo_RfNotchControl = 0x40000000,
|
|
||||||
sdrplay_api_Update_RspDuo_RfDabNotchControl = 0x80000000,
|
|
||||||
} sdrplay_api_ReasonForUpdateT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Update_Ext1_None = 0x00000000,
|
|
||||||
|
|
||||||
// Reasons for master only mode
|
|
||||||
sdrplay_api_Update_RspDx_HdrEnable = 0x00000001,
|
|
||||||
sdrplay_api_Update_RspDx_BiasTControl = 0x00000002,
|
|
||||||
sdrplay_api_Update_RspDx_AntennaControl = 0x00000004,
|
|
||||||
sdrplay_api_Update_RspDx_RfNotchControl = 0x00000008,
|
|
||||||
sdrplay_api_Update_RspDx_RfDabNotchControl = 0x00000010,
|
|
||||||
sdrplay_api_Update_RspDx_HdrBw = 0x00000020,
|
|
||||||
sdrplay_api_Update_RspDuo_ResetSlaveFlags = 0x00000040,
|
|
||||||
|
|
||||||
// Reasons for master and slave mode
|
|
||||||
} sdrplay_api_ReasonForUpdateExtension1T;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_DbgLvl_Disable = 0,
|
|
||||||
sdrplay_api_DbgLvl_Verbose = 1,
|
|
||||||
sdrplay_api_DbgLvl_Warning = 2,
|
|
||||||
sdrplay_api_DbgLvl_Error = 3,
|
|
||||||
sdrplay_api_DbgLvl_Message = 4,
|
|
||||||
} sdrplay_api_DbgLvl_t;
|
|
||||||
|
|
||||||
// Device structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char SerNo[SDRPLAY_MAX_SER_NO_LEN];
|
|
||||||
unsigned char hwVer;
|
|
||||||
sdrplay_api_TunerSelectT tuner;
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode;
|
|
||||||
unsigned char valid;
|
|
||||||
double rspDuoSampleFreq;
|
|
||||||
HANDLE dev;
|
|
||||||
} sdrplay_api_DeviceT;
|
|
||||||
|
|
||||||
// Device parameter structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_DevParamsT *devParams;
|
|
||||||
sdrplay_api_RxChannelParamsT *rxChannelA;
|
|
||||||
sdrplay_api_RxChannelParamsT *rxChannelB;
|
|
||||||
} sdrplay_api_DeviceParamsT;
|
|
||||||
|
|
||||||
// Extended error message structure
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char file[256];
|
|
||||||
char function[256];
|
|
||||||
int line;
|
|
||||||
char message[1024];
|
|
||||||
} sdrplay_api_ErrorInfoT;
|
|
||||||
|
|
||||||
// Comman API function types
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Open_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Close_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_ApiVersion_t)(float *apiVer);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_LockDeviceApi_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_UnlockDeviceApi_t)(void);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_GetDevices_t)(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SelectDevice_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_ReleaseDevice_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef const char* (*sdrplay_api_GetErrorString_t)(sdrplay_api_ErrT err);
|
|
||||||
typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastError_t)(sdrplay_api_DeviceT *device);
|
|
||||||
typedef sdrplay_api_ErrorInfoT* (*sdrplay_api_GetLastErrorByType_t)(sdrplay_api_DeviceT *device, int type, unsigned long long *time);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_DisableHeartbeat_t)(void);
|
|
||||||
|
|
||||||
// Device API function types
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_DebugEnable_t)(HANDLE dev, sdrplay_api_DbgLvl_t dbgLvl);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_GetDeviceParams_t)(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Init_t)(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Uninit_t)(HANDLE dev);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_Update_t)(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoActiveTuner_t)(HANDLE dev, sdrplay_api_TunerSelectT *tuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoDualTunerModeSampleRate_t)(double *currentSampleRate, double newSampleRate);
|
|
||||||
typedef sdrplay_api_ErrT (*sdrplay_api_SwapRspDuoMode_t)(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
|
|
||||||
sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
|
|
||||||
// API function definitions
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C"
|
|
||||||
{
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Comman API function definitions
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Open(void);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Close(void);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_ApiVersion(float *apiVer);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_LockDeviceApi(void);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_UnlockDeviceApi(void);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_GetDevices(sdrplay_api_DeviceT *devices, unsigned int *numDevs, unsigned int maxDevs);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SelectDevice(sdrplay_api_DeviceT *device);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_ReleaseDevice(sdrplay_api_DeviceT *device);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER const char* sdrplay_api_GetErrorString(sdrplay_api_ErrT err);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastError(sdrplay_api_DeviceT *device);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrorInfoT* sdrplay_api_GetLastErrorByType(sdrplay_api_DeviceT *device, int type, unsigned long long *time);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_DisableHeartbeat(void); // Must be called before sdrplay_api_SelectDevice()
|
|
||||||
|
|
||||||
// Device API function definitions
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_DebugEnable(HANDLE dev, sdrplay_api_DbgLvl_t enable);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_GetDeviceParams(HANDLE dev, sdrplay_api_DeviceParamsT **deviceParams);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Init(HANDLE dev, sdrplay_api_CallbackFnsT *callbackFns, void *cbContext);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Uninit(HANDLE dev);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_Update(HANDLE dev, sdrplay_api_TunerSelectT tuner, sdrplay_api_ReasonForUpdateT reasonForUpdate, sdrplay_api_ReasonForUpdateExtension1T reasonForUpdateExt1);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SwapRspDuoActiveTuner(HANDLE dev, sdrplay_api_TunerSelectT *currentTuner, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SwapRspDuoDualTunerModeSampleRate(HANDLE dev, double *currentSampleRate, double newSampleRate);
|
|
||||||
_SDRPLAY_DLL_QUALIFIER sdrplay_api_ErrT sdrplay_api_SwapRspDuoMode(sdrplay_api_DeviceT *currDevice, sdrplay_api_DeviceParamsT **deviceParams,
|
|
||||||
sdrplay_api_RspDuoModeT rspDuoMode, double sampleRate, sdrplay_api_TunerSelectT tuner,
|
|
||||||
sdrplay_api_Bw_MHzT bwType, sdrplay_api_If_kHzT ifType, sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_H
|
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_CALLBACK_H
|
|
||||||
#define SDRPLAY_API_CALLBACK_H
|
|
||||||
|
|
||||||
// Event callback enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Overload_Detected = 0,
|
|
||||||
sdrplay_api_Overload_Corrected = 1,
|
|
||||||
} sdrplay_api_PowerOverloadCbEventIdT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_MasterInitialised = 0,
|
|
||||||
sdrplay_api_SlaveAttached = 1,
|
|
||||||
sdrplay_api_SlaveDetached = 2,
|
|
||||||
sdrplay_api_SlaveInitialised = 3,
|
|
||||||
sdrplay_api_SlaveUninitialised = 4,
|
|
||||||
sdrplay_api_MasterDllDisappeared = 5,
|
|
||||||
sdrplay_api_SlaveDllDisappeared = 6,
|
|
||||||
} sdrplay_api_RspDuoModeCbEventIdT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_GainChange = 0,
|
|
||||||
sdrplay_api_PowerOverloadChange = 1,
|
|
||||||
sdrplay_api_DeviceRemoved = 2,
|
|
||||||
sdrplay_api_RspDuoModeChange = 3,
|
|
||||||
sdrplay_api_DeviceFailure = 4,
|
|
||||||
} sdrplay_api_EventT;
|
|
||||||
|
|
||||||
// Event callback parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int gRdB;
|
|
||||||
unsigned int lnaGRdB;
|
|
||||||
double currGain;
|
|
||||||
} sdrplay_api_GainCbParamT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_PowerOverloadCbEventIdT powerOverloadChangeType;
|
|
||||||
} sdrplay_api_PowerOverloadCbParamT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuoModeCbEventIdT modeChangeType;
|
|
||||||
} sdrplay_api_RspDuoModeCbParamT;
|
|
||||||
|
|
||||||
// Event parameters overlay
|
|
||||||
typedef union
|
|
||||||
{
|
|
||||||
sdrplay_api_GainCbParamT gainParams;
|
|
||||||
sdrplay_api_PowerOverloadCbParamT powerOverloadParams;
|
|
||||||
sdrplay_api_RspDuoModeCbParamT rspDuoModeParams;
|
|
||||||
} sdrplay_api_EventParamsT;
|
|
||||||
|
|
||||||
// Stream callback parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int firstSampleNum;
|
|
||||||
int grChanged;
|
|
||||||
int rfChanged;
|
|
||||||
int fsChanged;
|
|
||||||
unsigned int numSamples;
|
|
||||||
} sdrplay_api_StreamCbParamsT;
|
|
||||||
|
|
||||||
// Callback function prototypes
|
|
||||||
typedef void (*sdrplay_api_StreamCallback_t)(short *xi, short *xq, sdrplay_api_StreamCbParamsT *params, unsigned int numSamples, unsigned int reset, void *cbContext);
|
|
||||||
typedef void (*sdrplay_api_EventCallback_t)(sdrplay_api_EventT eventId, sdrplay_api_TunerSelectT tuner, sdrplay_api_EventParamsT *params, void *cbContext);
|
|
||||||
|
|
||||||
// Callback function struct
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_StreamCallback_t StreamACbFn;
|
|
||||||
sdrplay_api_StreamCallback_t StreamBCbFn;
|
|
||||||
sdrplay_api_EventCallback_t EventCbFn;
|
|
||||||
} sdrplay_api_CallbackFnsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_CALLBACK_H
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_CONTROL_H
|
|
||||||
#define SDRPLAY_API_CONTROL_H
|
|
||||||
|
|
||||||
// Control parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_AGC_DISABLE = 0,
|
|
||||||
sdrplay_api_AGC_100HZ = 1,
|
|
||||||
sdrplay_api_AGC_50HZ = 2,
|
|
||||||
sdrplay_api_AGC_5HZ = 3,
|
|
||||||
sdrplay_api_AGC_CTRL_EN = 4
|
|
||||||
} sdrplay_api_AgcControlT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_ADSB_DECIMATION = 0,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_LOWPASS = 1,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_2MHZ = 2,
|
|
||||||
sdrplay_api_ADSB_NO_DECIMATION_BANDPASS_3MHZ = 3
|
|
||||||
} sdrplay_api_AdsbModeT;
|
|
||||||
|
|
||||||
// Control parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char DCenable; // default: 1
|
|
||||||
unsigned char IQenable; // default: 1
|
|
||||||
} sdrplay_api_DcOffsetT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char enable; // default: 0
|
|
||||||
unsigned char decimationFactor; // default: 1
|
|
||||||
unsigned char wideBandSignal; // default: 0
|
|
||||||
} sdrplay_api_DecimationT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_AgcControlT enable; // default: sdrplay_api_AGC_50HZ
|
|
||||||
int setPoint_dBfs; // default: -60
|
|
||||||
unsigned short attack_ms; // default: 0
|
|
||||||
unsigned short decay_ms; // default: 0
|
|
||||||
unsigned short decay_delay_ms; // default: 0
|
|
||||||
unsigned short decay_threshold_dB; // default: 0
|
|
||||||
int syncUpdate; // default: 0
|
|
||||||
} sdrplay_api_AgcT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_DcOffsetT dcOffset;
|
|
||||||
sdrplay_api_DecimationT decimation;
|
|
||||||
sdrplay_api_AgcT agc;
|
|
||||||
sdrplay_api_AdsbModeT adsbMode; //default: sdrplay_api_ADSB_DECIMATION
|
|
||||||
} sdrplay_api_ControlParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_CONTROL_H
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_DEV_H
|
|
||||||
#define SDRPLAY_API_DEV_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_rsp1a.h"
|
|
||||||
#include "sdrplay_api_rsp2.h"
|
|
||||||
#include "sdrplay_api_rspDuo.h"
|
|
||||||
#include "sdrplay_api_rspDx.h"
|
|
||||||
|
|
||||||
// Dev parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_ISOCH = 0,
|
|
||||||
sdrplay_api_BULK = 1
|
|
||||||
} sdrplay_api_TransferModeT;
|
|
||||||
|
|
||||||
// Dev parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double fsHz; // default: 2000000.0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
unsigned char reCal; // default: 0
|
|
||||||
} sdrplay_api_FsFreqT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned int sampleNum; // default: 0
|
|
||||||
unsigned int period; // default: 0
|
|
||||||
} sdrplay_api_SyncUpdateT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char resetGainUpdate; // default: 0
|
|
||||||
unsigned char resetRfUpdate; // default: 0
|
|
||||||
unsigned char resetFsUpdate; // default: 0
|
|
||||||
} sdrplay_api_ResetFlagsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double ppm; // default: 0.0
|
|
||||||
sdrplay_api_FsFreqT fsFreq;
|
|
||||||
sdrplay_api_SyncUpdateT syncUpdate;
|
|
||||||
sdrplay_api_ResetFlagsT resetFlags;
|
|
||||||
sdrplay_api_TransferModeT mode; // default: sdrplay_api_ISOCH
|
|
||||||
unsigned int samplesPerPkt; // default: 0 (output param)
|
|
||||||
sdrplay_api_Rsp1aParamsT rsp1aParams;
|
|
||||||
sdrplay_api_Rsp2ParamsT rsp2Params;
|
|
||||||
sdrplay_api_RspDuoParamsT rspDuoParams;
|
|
||||||
sdrplay_api_RspDxParamsT rspDxParams;
|
|
||||||
} sdrplay_api_DevParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_DEV_H
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSP1A_H
|
|
||||||
#define SDRPLAY_API_RSP1A_H
|
|
||||||
|
|
||||||
#define RSPIA_NUM_LNA_STATES 10
|
|
||||||
#define RSPIA_NUM_LNA_STATES_AM 7
|
|
||||||
#define RSPIA_NUM_LNA_STATES_LBAND 9
|
|
||||||
|
|
||||||
// RSP1A parameter enums
|
|
||||||
|
|
||||||
// RSP1A parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp1aParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp1aTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSP1A_H
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSP2_H
|
|
||||||
#define SDRPLAY_API_RSP2_H
|
|
||||||
|
|
||||||
#define RSPII_NUM_LNA_STATES 9
|
|
||||||
#define RSPII_NUM_LNA_STATES_AMPORT 5
|
|
||||||
#define RSPII_NUM_LNA_STATES_420MHZ 6
|
|
||||||
|
|
||||||
// RSP2 parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Rsp2_ANTENNA_A = 5,
|
|
||||||
sdrplay_api_Rsp2_ANTENNA_B = 6,
|
|
||||||
} sdrplay_api_Rsp2_AntennaSelectT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Rsp2_AMPORT_1 = 1,
|
|
||||||
sdrplay_api_Rsp2_AMPORT_2 = 0,
|
|
||||||
} sdrplay_api_Rsp2_AmPortSelectT;
|
|
||||||
|
|
||||||
// RSP2 parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char extRefOutputEn; // default: 0
|
|
||||||
} sdrplay_api_Rsp2ParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_Rsp2_AmPortSelectT amPortSel; // default: sdrplay_api_Rsp2_AMPORT_2
|
|
||||||
sdrplay_api_Rsp2_AntennaSelectT antennaSel; // default: sdrplay_api_Rsp2_ANTENNA_A
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_Rsp2TunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSP2_H
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSPduo_H
|
|
||||||
#define SDRPLAY_API_RSPduo_H
|
|
||||||
|
|
||||||
#define RSPDUO_NUM_LNA_STATES 10
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_AMPORT 5
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_AM 7
|
|
||||||
#define RSPDUO_NUM_LNA_STATES_LBAND 9
|
|
||||||
|
|
||||||
// RSPduo parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuoMode_Unknown = 0,
|
|
||||||
sdrplay_api_RspDuoMode_Single_Tuner = 1,
|
|
||||||
sdrplay_api_RspDuoMode_Dual_Tuner = 2,
|
|
||||||
sdrplay_api_RspDuoMode_Master = 4,
|
|
||||||
sdrplay_api_RspDuoMode_Slave = 8,
|
|
||||||
} sdrplay_api_RspDuoModeT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDuo_AMPORT_1 = 1,
|
|
||||||
sdrplay_api_RspDuo_AMPORT_2 = 0,
|
|
||||||
} sdrplay_api_RspDuo_AmPortSelectT;
|
|
||||||
|
|
||||||
// RSPduo parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int extRefOutputEn; // default: 0
|
|
||||||
} sdrplay_api_RspDuoParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char resetGainUpdate; // default: 0
|
|
||||||
unsigned char resetRfUpdate; // default: 0
|
|
||||||
} sdrplay_api_RspDuo_ResetSlaveFlagsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_RspDuo_AmPortSelectT tuner1AmPortSel; // default: sdrplay_api_RspDuo_AMPORT_2
|
|
||||||
unsigned char tuner1AmNotchEnable; // default: 0
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
sdrplay_api_RspDuo_ResetSlaveFlagsT resetSlaveFlags;
|
|
||||||
} sdrplay_api_RspDuoTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSPduo_H
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RSPDX_H
|
|
||||||
#define SDRPLAY_API_RSPDX_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_tuner.h"
|
|
||||||
|
|
||||||
#define RSPDX_NUM_LNA_STATES 28 // Number of LNA states in all bands (except where defined differently below)
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_0_12 19 // Number of LNA states when using AM Port 2 between 0 and 12MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_12_50 20 // Number of LNA states when using AM Port 2 between 12 and 50MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_AMPORT2_50_60 25 // Number of LNA states when using AM Port 2 between 50 and 60MHz
|
|
||||||
#define RSPDX_NUM_LNA_STATES_VHF_BAND3 27 // Number of LNA states in VHF and Band3
|
|
||||||
#define RSPDX_NUM_LNA_STATES_420MHZ 21 // Number of LNA states in 420MHz band
|
|
||||||
#define RSPDX_NUM_LNA_STATES_LBAND 19 // Number of LNA states in L-band
|
|
||||||
#define RSPDX_NUM_LNA_STATES_DX 22 // Number of LNA states in DX path
|
|
||||||
|
|
||||||
// RSPdx parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_ANTENNA_A = 0,
|
|
||||||
sdrplay_api_RspDx_ANTENNA_B = 1,
|
|
||||||
sdrplay_api_RspDx_ANTENNA_C = 2,
|
|
||||||
} sdrplay_api_RspDx_AntennaSelectT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_0_200 = 0,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_0_500 = 1,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_1_200 = 2,
|
|
||||||
sdrplay_api_RspDx_HDRMODE_BW_1_700 = 3,
|
|
||||||
} sdrplay_api_RspDx_HdrModeBwT;
|
|
||||||
|
|
||||||
// RSPdx parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char hdrEnable; // default: 0
|
|
||||||
unsigned char biasTEnable; // default: 0
|
|
||||||
sdrplay_api_RspDx_AntennaSelectT antennaSel; // default: sdrplay_api_RspDx_ANTENNA_A
|
|
||||||
unsigned char rfNotchEnable; // default: 0
|
|
||||||
unsigned char rfDabNotchEnable; // default: 0
|
|
||||||
} sdrplay_api_RspDxParamsT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_RspDx_HdrModeBwT hdrBw; // default: sdrplay_api_RspDx_HDRMODE_BW_1_700
|
|
||||||
} sdrplay_api_RspDxTunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RSPDX_H
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
#define SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
|
|
||||||
#include "sdrplay_api_tuner.h"
|
|
||||||
#include "sdrplay_api_control.h"
|
|
||||||
#include "sdrplay_api_rsp1a.h"
|
|
||||||
#include "sdrplay_api_rsp2.h"
|
|
||||||
#include "sdrplay_api_rspDuo.h"
|
|
||||||
#include "sdrplay_api_rspDx.h"
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_TunerParamsT tunerParams;
|
|
||||||
sdrplay_api_ControlParamsT ctrlParams;
|
|
||||||
sdrplay_api_Rsp1aTunerParamsT rsp1aTunerParams;
|
|
||||||
sdrplay_api_Rsp2TunerParamsT rsp2TunerParams;
|
|
||||||
sdrplay_api_RspDuoTunerParamsT rspDuoTunerParams;
|
|
||||||
sdrplay_api_RspDxTunerParamsT rspDxTunerParams;
|
|
||||||
} sdrplay_api_RxChannelParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_RX_CHANNEL_H
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
#ifndef SDRPLAY_API_TUNER_H
|
|
||||||
#define SDRPLAY_API_TUNER_H
|
|
||||||
|
|
||||||
#define MAX_BB_GR (59)
|
|
||||||
|
|
||||||
// Tuner parameter enums
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_BW_Undefined = 0,
|
|
||||||
sdrplay_api_BW_0_200 = 200,
|
|
||||||
sdrplay_api_BW_0_300 = 300,
|
|
||||||
sdrplay_api_BW_0_600 = 600,
|
|
||||||
sdrplay_api_BW_1_536 = 1536,
|
|
||||||
sdrplay_api_BW_5_000 = 5000,
|
|
||||||
sdrplay_api_BW_6_000 = 6000,
|
|
||||||
sdrplay_api_BW_7_000 = 7000,
|
|
||||||
sdrplay_api_BW_8_000 = 8000
|
|
||||||
} sdrplay_api_Bw_MHzT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_IF_Undefined = -1,
|
|
||||||
sdrplay_api_IF_Zero = 0,
|
|
||||||
sdrplay_api_IF_0_450 = 450,
|
|
||||||
sdrplay_api_IF_1_620 = 1620,
|
|
||||||
sdrplay_api_IF_2_048 = 2048
|
|
||||||
} sdrplay_api_If_kHzT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_LO_Undefined = 0,
|
|
||||||
sdrplay_api_LO_Auto = 1,
|
|
||||||
sdrplay_api_LO_120MHz = 2,
|
|
||||||
sdrplay_api_LO_144MHz = 3,
|
|
||||||
sdrplay_api_LO_168MHz = 4
|
|
||||||
} sdrplay_api_LoModeT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_EXTENDED_MIN_GR = 0,
|
|
||||||
sdrplay_api_NORMAL_MIN_GR = 20
|
|
||||||
} sdrplay_api_MinGainReductionT;
|
|
||||||
|
|
||||||
typedef enum
|
|
||||||
{
|
|
||||||
sdrplay_api_Tuner_Neither = 0,
|
|
||||||
sdrplay_api_Tuner_A = 1,
|
|
||||||
sdrplay_api_Tuner_B = 2,
|
|
||||||
sdrplay_api_Tuner_Both = 3,
|
|
||||||
} sdrplay_api_TunerSelectT;
|
|
||||||
|
|
||||||
// Tuner parameter structs
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
float curr;
|
|
||||||
float max;
|
|
||||||
float min;
|
|
||||||
} sdrplay_api_GainValuesT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
int gRdB; // default: 50
|
|
||||||
unsigned char LNAstate; // default: 0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
sdrplay_api_MinGainReductionT minGr; // default: sdrplay_api_NORMAL_MIN_GR
|
|
||||||
sdrplay_api_GainValuesT gainVals; // output parameter
|
|
||||||
} sdrplay_api_GainT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
double rfHz; // default: 200000000.0
|
|
||||||
unsigned char syncUpdate; // default: 0
|
|
||||||
} sdrplay_api_RfFreqT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
unsigned char dcCal; // default: 3 (Periodic mode)
|
|
||||||
unsigned char speedUp; // default: 0 (No speedup)
|
|
||||||
int trackTime; // default: 1 (=> time in uSec = (72 * 3 * trackTime) / 24e6 = 9uSec)
|
|
||||||
int refreshRateTime; // default: 2048 (=> time in uSec = (72 * 3 * refreshRateTime) / 24e6 = 18432uSec)
|
|
||||||
} sdrplay_api_DcOffsetTunerT;
|
|
||||||
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
sdrplay_api_Bw_MHzT bwType; // default: sdrplay_api_BW_0_200
|
|
||||||
sdrplay_api_If_kHzT ifType; // default: sdrplay_api_IF_Zero
|
|
||||||
sdrplay_api_LoModeT loMode; // default: sdrplay_api_LO_Auto
|
|
||||||
sdrplay_api_GainT gain;
|
|
||||||
sdrplay_api_RfFreqT rfFreq;
|
|
||||||
sdrplay_api_DcOffsetTunerT dcOffsetTuner;
|
|
||||||
} sdrplay_api_TunerParamsT;
|
|
||||||
|
|
||||||
#endif //SDRPLAY_API_TUNER_H
|
|
||||||
442
build.gradle
442
build.gradle
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2024 Dennis Sheirer
|
* Copyright (C) 2014-2026 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
|
||||||
@@ -17,16 +17,18 @@
|
|||||||
* ****************************************************************************
|
* ****************************************************************************
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
import org.beryx.runtime.RuntimeZipTask
|
||||||
|
import org.gradle.internal.jvm.Jvm
|
||||||
|
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
|
||||||
|
|
||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Instructions for building/compiling the sdrtrunk application.
|
* Instructions for building/compiling the sdrtrunk application.
|
||||||
*
|
*
|
||||||
* Prerequisites:
|
* Prerequisites:
|
||||||
* Install and configure an OpenJDK version 22+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
|
* Install and configure an OpenJDK version 27+ that includes the JavaFX modules (e.g. Bellsoft Liberica JDK)
|
||||||
* - Optional: install and configure Gradle 8.10+
|
* - Optional: install and configure Gradle 9.8+
|
||||||
*
|
*
|
||||||
* Scenario 1: run the application via gradle command line from the source code root directory:
|
* Scenario 1: run the application via gradle command line from the source code root directory:
|
||||||
* command: ./gradlew run
|
* command: ./gradlew run
|
||||||
@@ -47,27 +49,79 @@ plugins {
|
|||||||
id 'application'
|
id 'application'
|
||||||
id 'java'
|
id 'java'
|
||||||
id 'idea'
|
id 'idea'
|
||||||
id 'org.beryx.runtime' version '1.12.7'
|
id 'org.beryx.runtime' version '2.0.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
/**
|
||||||
mavenCentral()
|
* Version is derived from the most recent 'v<version>' git tag (e.g. v1.0.0-beta-1 -> 1.0.0-beta-1). Commits after
|
||||||
maven { url "https://jitpack.io" }
|
* the tag produce a version like 1.0.0-beta-1-14-g4626d567 and uncommitted changes append '-dirty'. The moving
|
||||||
|
* 'nightly' tag is ignored. Override with -PprojectVersion=<version> (the nightly build uses 'nightly' so that the
|
||||||
|
* nightly release asset names stay the same). Falls back to 'unknown' when built outside a git checkout.
|
||||||
|
*/
|
||||||
|
String gitDescribe = describeGitVersion()
|
||||||
|
version = project.findProperty('projectVersion') ?: (gitDescribe ? gitDescribe.substring(1) : 'unknown')
|
||||||
|
|
||||||
|
String describeGitVersion()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
def describe = providers.exec {
|
||||||
|
commandLine 'git', 'describe', '--tags', '--match', 'v[0-9]*', '--dirty'
|
||||||
|
ignoreExitValue = true
|
||||||
|
}
|
||||||
|
|
||||||
|
if(describe.result.get().exitValue == 0)
|
||||||
|
{
|
||||||
|
return describe.standardOutput.asText.get().trim()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch(Exception e)
|
||||||
|
{
|
||||||
|
logger.warn("Unable to determine version from git tags: " + e.message)
|
||||||
|
}
|
||||||
|
|
||||||
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
//Version is defined in gradle.properties so that we can CLI override it for nightly builds.
|
tasks.register('printVersion') {
|
||||||
version = project.findProperty('projectVersion')
|
description = 'Prints the project version'
|
||||||
|
def projectVersion = version
|
||||||
//Java 23 is required for this version of the Project Panama preview/incubator feature
|
doLast {
|
||||||
java {
|
println projectVersion
|
||||||
toolchain {
|
|
||||||
languageVersion = JavaLanguageVersion.of(23)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
//Java 27 is required for this version of the Project Panama preview/incubator feature
|
||||||
main.java.srcDirs 'src/main'
|
java {
|
||||||
test.java.srcDirs 'src/test'
|
toolchain {
|
||||||
|
languageVersion = JavaLanguageVersion.of(27)
|
||||||
|
vendor = JvmVendorSpec.BELLSOFT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verifies that the selected toolchain JDK includes the JavaFX modules (e.g. Bellsoft Liberica 'Full JDK').
|
||||||
|
*
|
||||||
|
* Gradle's toolchain spec can only select by language version, vendor and implementation, so it can't distinguish
|
||||||
|
* between the Liberica JDK packages that do and don't bundle JavaFX. This task fails the build with a clear message
|
||||||
|
* instead of allowing compilation to fail with missing javafx packages.
|
||||||
|
*/
|
||||||
|
tasks.register('verifyToolchainJavaFx') {
|
||||||
|
def jdkHome = javaToolchains.launcherFor(java.toolchain).map { it.metadata.installationPath.asFile }
|
||||||
|
|
||||||
|
doLast {
|
||||||
|
def release = new File(jdkHome.get(), 'release')
|
||||||
|
|
||||||
|
if(!release.exists() || !release.text.contains('javafx.base')) {
|
||||||
|
throw new GradleException("The JDK at [${jdkHome.get()}] does not include the JavaFX modules. Install " +
|
||||||
|
"the Bellsoft Liberica JDK 27 'Full' package (includes LibericaFX), or use " +
|
||||||
|
"-Porg.gradle.java.installations.paths=<jdk path> to specify the JDK that Gradle should use.")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.named('compileJava') {
|
||||||
|
dependsOn 'verifyToolchainJavaFx'
|
||||||
}
|
}
|
||||||
|
|
||||||
test {
|
test {
|
||||||
@@ -77,58 +131,61 @@ test {
|
|||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
// JUnit Tests
|
// JUnit Tests
|
||||||
testImplementation(platform("org.junit:junit-bom:5.11.0"))
|
testImplementation(platform("org.junit:junit-bom:6.1.3"))
|
||||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.11.0'
|
testImplementation 'org.junit.jupiter:junit-jupiter-api'
|
||||||
|
|
||||||
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
|
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
|
||||||
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
|
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
||||||
|
|
||||||
//Jitpack imports
|
//Jitpack imports
|
||||||
implementation 'com.github.dnault:libresample4j:master'
|
implementation 'com.github.dnault:libresample4j:master'
|
||||||
implementation 'com.github.DSheirer.jmbe:jmbe-api:1.0.0'
|
implementation 'com.github.DSheirer.jmbe:api:v2.1.1'
|
||||||
implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'
|
implementation 'com.github.nwaldispuehl:java-lame:v3.98.4'
|
||||||
|
|
||||||
//mavenCentral/jcenter imports
|
//mavenCentral/jcenter imports
|
||||||
implementation 'ch.qos.logback:logback-classic:1.4.12'
|
implementation 'ch.qos.logback:logback-classic:1.6.6'
|
||||||
implementation 'ch.qos.logback:logback-core:1.4.14'
|
implementation 'ch.qos.logback:logback-core:1.6.6'
|
||||||
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.14.0'
|
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.23.0'
|
||||||
implementation 'com.fazecast:jSerialComm:2.9.3'
|
implementation 'com.formdev:flatlaf:3.8'
|
||||||
|
implementation 'com.formdev:flatlaf-intellij-themes:3.8' //Not imported - Theme.java loads these themes by class name
|
||||||
implementation 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
|
implementation 'com.github.jiconfont:jiconfont-font_awesome:4.7.0.1'
|
||||||
implementation 'com.github.jiconfont:jiconfont-javafx:1.0.0'
|
implementation 'com.github.jiconfont:jiconfont-javafx:1.0.0'
|
||||||
implementation 'com.github.jiconfont:jiconfont-swing:1.0.1'
|
implementation 'com.github.jiconfont:jiconfont-swing:1.0.1'
|
||||||
implementation 'com.github.wendykierp:JTransforms:3.1'
|
implementation('com.github.wendykierp:JTransforms:3.2') {
|
||||||
implementation 'com.google.code.gson:gson:2.10'
|
exclude group: 'junit' //JLargeArrays 1.7 declares junit as a compile dependency
|
||||||
implementation 'com.google.guava:guava:33.3.0-jre'
|
}
|
||||||
|
implementation 'com.google.code.gson:gson:2.15.0'
|
||||||
|
implementation 'com.google.guava:guava:33.8.0-jre'
|
||||||
implementation 'com.jidesoft:jide-oss:3.6.18'
|
implementation 'com.jidesoft:jide-oss:3.6.18'
|
||||||
implementation 'com.miglayout:miglayout-swing:11.0'
|
implementation 'com.miglayout:miglayout-swing:11.5.2'
|
||||||
implementation 'com.mpatric:mp3agic:0.9.1'
|
implementation 'com.mpatric:mp3agic:0.9.1'
|
||||||
implementation 'commons-io:commons-io:2.11.0'
|
implementation 'commons-io:commons-io:2.22.0'
|
||||||
implementation 'eu.hansolo:charts:1.0.5'
|
implementation 'io.github.dsheirer:jairspy:1.0.12.1' //Airspy tuners - GitHub release, see settings.gradle
|
||||||
implementation 'io.github.dsheirer:radio-reference-api:18.0.0'
|
implementation 'io.github.dsheirer:jairspyhf:1.8.1.1' //Airspy HF+ tuners - GitHub release, see settings.gradle
|
||||||
implementation 'javax.usb:usb-api:1.0.2'
|
implementation 'io.github.dsheirer:jbladerf:2.6.0.1' //bladeRF tuners - GitHub release, see settings.gradle
|
||||||
implementation 'net.coderazzi:tablefilter-swing:5.5.4'
|
implementation 'io.github.dsheirer:jhackrf:2026.01.3.1' //HackRF tuners - GitHub release, see settings.gradle
|
||||||
implementation 'org.apache.commons:commons-compress:1.26.0'
|
implementation 'io.github.dsheirer:jlibusb:1.0.30.1' //libusb and USB hotplug for the tuner libraries - GitHub release; not pulled in transitively
|
||||||
implementation 'org.apache.commons:commons-lang3:3.12.0'
|
implementation 'io.github.dsheirer:jhydrasdr:1.1.4.1' //HydraSDR tuners - GitHub release, see settings.gradle
|
||||||
|
implementation 'io.github.dsheirer:jlimesdr:25.1.0.2' //LimeSDR tuners - GitHub release, see settings.gradle
|
||||||
|
implementation 'io.github.dsheirer:jrtl:1.4.0.3' //RTL-SDR tuners - GitHub release, see settings.gradle
|
||||||
|
implementation 'io.github.dsheirer:jsdrplay:3.15.3' //SDRplay RSP tuners - GitHub release, see settings.gradle
|
||||||
|
implementation 'io.github.dsheirer:radio-reference-api:18.1.0' //RadioReference SOAP API - GitHub release, see settings.gradle
|
||||||
|
implementation 'org.apache.commons:commons-compress:1.28.0' //Not used directly - overrides the vulnerable 1.21 version from jarchivelib
|
||||||
|
implementation 'org.apache.commons:commons-lang3:3.21.0'
|
||||||
implementation 'org.apache.commons:commons-math3:3.6.1'
|
implementation 'org.apache.commons:commons-math3:3.6.1'
|
||||||
implementation 'org.apache.commons:commons-csv:1.9.0'
|
implementation 'org.apache.commons:commons-csv:1.14.1'
|
||||||
implementation 'org.apache.mina:mina-core:2.2.1'
|
implementation 'org.apache.mina:mina-core:2.2.10'
|
||||||
implementation 'org.apache.mina:mina-http:2.2.1'
|
implementation 'org.apache.mina:mina-http:2.2.10'
|
||||||
implementation 'org.controlsfx:controlsfx:11.1.2'
|
implementation 'org.controlsfx:controlsfx:11.2.6'
|
||||||
implementation 'org.rauschig:jarchivelib:1.2.0'
|
implementation 'org.rauschig:jarchivelib:1.2.0'
|
||||||
implementation 'org.slf4j:slf4j-api:2.0.5'
|
implementation 'org.slf4j:slf4j-api:2.0.20'
|
||||||
implementation 'org.usb4java:libusb4java:1.3.0'
|
|
||||||
implementation 'org.usb4java:usb4java:1.3.0'
|
|
||||||
implementation 'org.usb4java:usb4java-javax:1.3.0'
|
|
||||||
implementation 'io.github.dsheirer:libusb4java-darwin-aarch64:1.3.1' //usb4java native lib for OSX M1 cpu
|
|
||||||
implementation 'pl.edu.icm:JLargeArrays:1.6'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
def os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem
|
def os = DefaultNativePlatform.currentOperatingSystem
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is needed for the JDK23 vector API ... until it moves out of incubation or preview
|
* This is needed for the JDK23+ vector API ... until it moves out of incubation or preview
|
||||||
*/
|
*/
|
||||||
tasks.withType(JavaCompile) {
|
tasks.withType(JavaCompile).configureEach {
|
||||||
options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator
|
options.compilerArgs.add("--enable-preview") //Project Panama Vector API is still in incubator
|
||||||
options.compilerArgs.add("--add-modules=jdk.incubator.vector") //Project Panama Vector API is still in incubator
|
options.compilerArgs.add("--add-modules=jdk.incubator.vector") //Project Panama Vector API is still in incubator
|
||||||
}
|
}
|
||||||
@@ -139,22 +196,33 @@ tasks.withType(JavaCompile) {
|
|||||||
def jvmArgsWindows =
|
def jvmArgsWindows =
|
||||||
['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
|
['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
|
||||||
'--add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED', //windows users for JIDE
|
'--add-exports=java.desktop/com.sun.java.swing.plaf.windows=ALL-UNNAMED', //windows users for JIDE
|
||||||
'--add-modules=jdk.incubator.vector', //Project Panama Vector API is still in incubator
|
'--add-modules=jdk.incubator.vector', //Project Panama vector API is still in incubator
|
||||||
'--enable-preview', //Project Panama Vector API is still in incubator
|
'--enable-preview', //Project Panama Vector API is still in incubator
|
||||||
'--enable-native-access=ALL-UNNAMED', //Suppress unsafe warnings for FFM API Foreign Memory calls
|
'--enable-native-access=ALL-UNNAMED', //Suppress unsafe warnings for FFM API Foreign Memory calls
|
||||||
'-Djava.library.path=c:\\Program Files\\SDRplay\\API\\x64'] //SDRPlay API library path
|
'--enable-native-access=javafx.graphics', //JDK24 - suppress restricted java.lang.System calls
|
||||||
|
'--sun-misc-unsafe-memory-access=allow'] //JDK24 - suppress sun.misc.Unsafe::allocateMemory warning
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JVM Arguments for running the application on Linux.
|
* JVM Arguments for running the application on Linux.
|
||||||
*/
|
*/
|
||||||
def jvmArgsLinux =
|
def jvmArgsLinux =
|
||||||
['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
|
['--add-exports=javafx.base/com.sun.javafx.event=ALL-UNNAMED', //Needed for controls-fx.jar
|
||||||
'--add-modules=jdk.incubator.vector', //Needed while Project Panama API is still in incubator
|
'--add-modules=jdk.incubator.vector', //Project Panama vector API is still in incubator
|
||||||
'--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
|
'--enable-preview', //Project Panama Vector & Foreign Function APIs remain in incubator
|
||||||
'--enable-native-access=ALL-UNNAMED'] //SDRPlay API library path
|
'--sun-misc-unsafe-memory-access=allow', //JDK24 - suppress sun.misc.Unsafe::allocateMemory warning
|
||||||
|
'--enable-native-access=javafx.graphics', //JDK24 - suppress restricted java.lang.System calls
|
||||||
|
'--enable-native-access=ALL-UNNAMED'] //Suppress warnings for FFM API native calls (tuner libraries)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Startup splash screen image. The JVM shows it before any application code runs and closes it when the main window
|
||||||
|
* opens. The release launch scripts load it from the runtime image lib folder (see the runtime task below) and the
|
||||||
|
* gradle run task loads it from the resources folder. The JVM picks up the @2x image on HiDPI displays.
|
||||||
|
*/
|
||||||
|
def splashImages = ['sdrtrunk-splash.png', 'sdrtrunk-splash@2x.png']
|
||||||
|
def splashResourceDir = 'src/main/resources/images/sdrtrunk'
|
||||||
|
|
||||||
application {
|
application {
|
||||||
mainClassName = "io.github.dsheirer.gui.SDRTrunk"
|
mainClass = "io.github.dsheirer.gui.SDRTrunk"
|
||||||
|
|
||||||
if(os.isWindows()) {
|
if(os.isWindows()) {
|
||||||
applicationDefaultJvmArgs = jvmArgsWindows
|
applicationDefaultJvmArgs = jvmArgsWindows
|
||||||
@@ -164,11 +232,25 @@ application {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
tasks.named('run') {
|
||||||
|
jvmArgs "-splash:${file(splashResourceDir + '/' + splashImages[0]).absolutePath}"
|
||||||
|
}
|
||||||
|
|
||||||
|
test {
|
||||||
|
if(os.isWindows()) {
|
||||||
|
jvmArgs = jvmArgsWindows
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
jvmArgs = jvmArgsLinux
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
jar {
|
jar {
|
||||||
manifest {
|
manifest {
|
||||||
attributes (
|
attributes (
|
||||||
'Implementation-Title' : 'sdrtrunk project',
|
'Implementation-Title' : 'sdrtrunk project',
|
||||||
'Implementation-Version' : archiveVersion,
|
'Implementation-Version' : archiveVersion,
|
||||||
|
'Git-Describe' : gitDescribe ?: 'unknown',
|
||||||
'Created-By' : "Gradle ${gradle.gradleVersion}",
|
'Created-By' : "Gradle ${gradle.gradleVersion}",
|
||||||
'Build-Timestamp' : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
|
'Build-Timestamp' : new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
|
||||||
'Build-JDK' : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']}",
|
'Build-JDK' : "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']}",
|
||||||
@@ -184,6 +266,11 @@ idea {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
javadoc {
|
||||||
|
options.addStringOption('-add-modules', 'jdk.incubator.vector')
|
||||||
|
options.addStringOption('Xdoclint:none', '-quiet')
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Runtime target OS and CPU image names. We append version here so that version details are at end of zip filename.
|
* Runtime target OS and CPU image names. We append version here so that version details are at end of zip filename.
|
||||||
*/
|
*/
|
||||||
@@ -192,28 +279,19 @@ String targetLinuxX86_64 = 'linux-x86_64-v' + version
|
|||||||
String targetOsxAarch64 = 'osx-aarch64-v' + version
|
String targetOsxAarch64 = 'osx-aarch64-v' + version
|
||||||
String targetOsxX86_64 = 'osx-x86_64-v' + version
|
String targetOsxX86_64 = 'osx-x86_64-v' + version
|
||||||
String targetWindowsX86_64 = 'windows-x86_64-v' + version
|
String targetWindowsX86_64 = 'windows-x86_64-v' + version
|
||||||
|
String targetWindowsAarch64 = 'windows-aarch64-v' + version
|
||||||
/**
|
|
||||||
* Optional pre-downloaded Java Development Kit (JDK) for each target OS and CPU. These locations are hard-coded to the
|
|
||||||
* author's development environment, but can be changed to your environment if you want to use this build pattern.
|
|
||||||
*/
|
|
||||||
String jdk_base = '/home/denny/java_jdks/'
|
|
||||||
String jdk_linux_aarch64 = jdk_base + 'linux-arm64/jdk-22.0.2-full'
|
|
||||||
String jdk_linux_x86_64 = jdk_base + 'linux-x64/jdk-22.0.2-full'
|
|
||||||
String jdk_osx_x86_64 = jdk_base + 'osx-x64/jdk-22.0.2-full.jdk'
|
|
||||||
String jdk_osx_aarch64 = jdk_base + 'osx-arm64/jdk-22.0.2-full.jdk'
|
|
||||||
String jdk_windows_x86_64 = jdk_base + 'windows-x64/jdk-22.0.2-full'
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Download URLs to download the JDK as part of the gradle build packaging process
|
* Download URLs to download the JDK as part of the gradle build packaging process
|
||||||
*/
|
*/
|
||||||
def jdk_download_base = "https://download.bell-sw.com/java/23+38/bellsoft-jdk23+38-"
|
def jdk_download_base = "https://download.bell-sw.com/java/27+36/bellsoft-jdk27+36-"
|
||||||
def jdk_download_suffix = "-full.tar.gz"
|
def jdk_download_suffix = "-full.tar.gz"
|
||||||
def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix
|
def jdk_download_linux_aarch64 = jdk_download_base + "linux-aarch64" + jdk_download_suffix
|
||||||
def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix
|
def jdk_download_linux_x86_64 = jdk_download_base + "linux-amd64" + jdk_download_suffix
|
||||||
def jdk_download_osx_x86_64 = jdk_download_base + "macos-amd64" + jdk_download_suffix
|
def jdk_download_osx_x86_64 = jdk_download_base + "macos-amd64" + jdk_download_suffix
|
||||||
def jdk_download_osx_aarch64 = jdk_download_base + "macos-aarch64" + jdk_download_suffix
|
def jdk_download_osx_aarch64 = jdk_download_base + "macos-aarch64" + jdk_download_suffix
|
||||||
def jdk_download_windows_x86_64 = jdk_download_base + "windows-amd64-full.zip"
|
def jdk_download_windows_x86_64 = jdk_download_base + "windows-amd64-full.zip"
|
||||||
|
def jdk_download_windows_aarch64 = jdk_download_base + "windows-aarch64-full.zip"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configures the runtime zip task with additional options/settings.
|
* Configures the runtime zip task with additional options/settings.
|
||||||
@@ -221,25 +299,162 @@ def jdk_download_windows_x86_64 = jdk_download_base + "windows-amd64-full.zip"
|
|||||||
* @param jvmArgs to use (windows or linux)
|
* @param jvmArgs to use (windows or linux)
|
||||||
* @return configured task.
|
* @return configured task.
|
||||||
*/
|
*/
|
||||||
def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
|
def configure(RuntimeZipTask rt, List<String> jvmArgs) {
|
||||||
//Use the correct set of JVM arguments
|
//Use the correct set of JVM arguments, plus the startup splash screen that the runtime task copies to lib
|
||||||
rt.extension.launcherData.get().jvmArgs = jvmArgs
|
rt.extension.launcherData.get().jvmArgs = jvmArgs + ['-splash:{{BIN_DIR}}/../lib/sdrtrunk-splash.png']
|
||||||
|
|
||||||
//Additional modules to include with auto-detected modules.
|
//Additional modules to include with auto-detected modules.
|
||||||
|
//jdk.charsets - NXDN BIG5 encoding support
|
||||||
//jdk.crypto.ec - needed for HTTPS connections (broadcastify calls & map tile server)
|
//jdk.crypto.ec - needed for HTTPS connections (broadcastify calls & map tile server)
|
||||||
//jdk.incubator.vector - needed for Project Panama foreign function and vector apis
|
//jdk.incubator.vector - needed for Project Panama foreign function and vector apis
|
||||||
//jdk.accessibility is used with assistive technologies like screen readers
|
//jdk.accessibility is used with assistive technologies like screen readers
|
||||||
//java.management for JVM resource monitoring
|
//java.management for JVM resource monitoring
|
||||||
rt.extension.addModules('jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management')
|
//java.base, java.logging, java.net.http, java.prefs, javafx.controls, javafx.swing - required by sdrtrunk (jdeps)
|
||||||
|
rt.extension.addModules('jdk.charsets', 'jdk.crypto.ec', 'jdk.incubator.vector', 'jdk.accessibility', 'java.management',
|
||||||
|
'java.base', 'java.logging', 'java.net.http', 'java.prefs', 'javafx.controls', 'javafx.swing')
|
||||||
|
|
||||||
//Use auto-detected modules and 'add' any specified modules.
|
//Use only the modules listed above. The runtime plugin's module auto-detection uses a bundled ASM library that
|
||||||
rt.extension.additive.set(true)
|
//can't read Java 27 class files and logs a 'Failed to scan' error for each sdrtrunk class. The jdeps module check
|
||||||
|
//on the runtime task verifies that this list is complete.
|
||||||
|
rt.extension.additive.set(false)
|
||||||
|
|
||||||
//Recommended options for reducing/shrinking runtime target image size
|
//Recommended options for reducing/shrinking runtime target image size
|
||||||
rt.extension.addOptions('--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages')
|
rt.extension.addOptions('--strip-debug', '--compress', 'zip-6', '--no-header-files', '--no-man-pages')
|
||||||
|
|
||||||
//Runtime images have auto appended version in image zip name. Override to include version in single target image.
|
//Runtime images have auto appended version in image zip name. Override to include version in single target image.
|
||||||
rt.extension.imageZip.set(file("$buildDir/image/sdr-trunk.zip"))
|
// rt.extension.imageDir=layout.buildDirectory.dir('image')
|
||||||
|
rt.extension.imageZip.set(file(layout.buildDirectory.dir('image').get().file('sdr-trunk.zip')))
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Rewrites the jar file without the native library folders for other operating systems and architectures. Fails the
|
||||||
|
* build if a jar that contains native libraries doesn't contain the folder for the target.
|
||||||
|
* @param jar file to rewrite
|
||||||
|
* @param keep native folder for the target
|
||||||
|
* @return number of bytes removed from the jar
|
||||||
|
*/
|
||||||
|
long stripJar(File jar, String keep) {
|
||||||
|
def tunerPattern = ~/^[^\/]+\/native\/([^\/]+)\/.*/
|
||||||
|
def removed = [] as Set
|
||||||
|
def hadTuner = false, keptTuner = false
|
||||||
|
File temp = new File(jar.parentFile, jar.name + '.tmp')
|
||||||
|
|
||||||
|
new java.util.zip.ZipFile(jar).withCloseable { zip ->
|
||||||
|
def entries = zip.entries().toList()
|
||||||
|
|
||||||
|
entries.each { e ->
|
||||||
|
def tuner = tunerPattern.matcher(e.name)
|
||||||
|
|
||||||
|
if(tuner.matches()) {
|
||||||
|
hadTuner = true
|
||||||
|
if(tuner.group(1) == keep) { keptTuner = true } else { removed << e.name }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(hadTuner && !keptTuner) {
|
||||||
|
throw new GradleException("Native strip: ${jar.name} has no native/${keep} folder")
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!removed.isEmpty()) {
|
||||||
|
new java.util.zip.ZipOutputStream(new FileOutputStream(temp)).withCloseable { out ->
|
||||||
|
entries.findAll { !removed.contains(it.name) }.each { e ->
|
||||||
|
def copy = new java.util.zip.ZipEntry(e)
|
||||||
|
if(copy.method == java.util.zip.ZipEntry.DEFLATED) {
|
||||||
|
copy.compressedSize = -1
|
||||||
|
}
|
||||||
|
out.putNextEntry(copy)
|
||||||
|
zip.getInputStream(e).withCloseable { out << it }
|
||||||
|
out.closeEntry()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(removed.isEmpty()) {
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
long before = jar.length()
|
||||||
|
java.nio.file.Files.move(temp.toPath(), jar.toPath(), java.nio.file.StandardCopyOption.REPLACE_EXISTING)
|
||||||
|
return before - jar.length()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes the native libraries for other operating systems and architectures from the jars in each runtime target
|
||||||
|
* image, before the runtimeZip tasks package the images. The tuner libraries (jRTL, jAirspy, etc.) package their
|
||||||
|
* native libraries under '<library>/native/<os>-<arch>/', where the folder name matches the runtime target name
|
||||||
|
* '<os>-<arch>-v<version>' without the version suffix, except that the libraries use 'macos' where the target uses 'osx'.
|
||||||
|
*/
|
||||||
|
tasks.named('runtime') {rt ->
|
||||||
|
rt.doLast {
|
||||||
|
rt.targetPlatforms.get().keySet().each { target ->
|
||||||
|
def nativeFolder = (target - "-v${version}").replaceFirst(/^osx-/, 'macos-')
|
||||||
|
def lib = new File(rt.imageDir.asFile, "${project.name}-${target}/lib")
|
||||||
|
long total = 0
|
||||||
|
lib.listFiles({ File f -> f.name.endsWith('.jar') } as FileFilter).each { jar ->
|
||||||
|
total += stripJar(jar, nativeFolder)
|
||||||
|
}
|
||||||
|
logger.lifecycle("Native strip: removed ${String.format('%.1f', total / 1048576)} MB of other " +
|
||||||
|
"platform native libraries from [${target}]")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copies the startup splash screen images into the lib folder of each runtime target image, where the launch scripts
|
||||||
|
* load them from (-splash:{{BIN_DIR}}/../lib/...).
|
||||||
|
*/
|
||||||
|
tasks.named('runtime') {rt ->
|
||||||
|
rt.doLast {
|
||||||
|
rt.targetPlatforms.get().keySet().each { target ->
|
||||||
|
def lib = new File(rt.imageDir.asFile, "${project.name}-${target}/lib")
|
||||||
|
splashImages.each { name ->
|
||||||
|
java.nio.file.Files.copy(file(splashResourceDir + '/' + name).toPath(), new File(lib, name).toPath(),
|
||||||
|
java.nio.file.StandardCopyOption.REPLACE_EXISTING)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verifies that each runtime target image contains every module that the sdrtrunk jar requires, as reported by jdeps.
|
||||||
|
* This guards against the runtime plugin's module auto-detection silently missing modules (e.g. when it can't parse
|
||||||
|
* class files compiled for a newer Java version).
|
||||||
|
*/
|
||||||
|
def jdepsHome = javaToolchains.launcherFor(java.toolchain).map { it.metadata.installationPath.asFile }
|
||||||
|
def mainJar = tasks.named('jar').flatMap { it.archiveFile }
|
||||||
|
|
||||||
|
tasks.named('runtime') {rt ->
|
||||||
|
rt.doLast {
|
||||||
|
def jdeps = new File(jdepsHome.get(), 'bin/' + (os.isWindows() ? 'jdeps.exe' : 'jdeps')).absolutePath
|
||||||
|
def process = new ProcessBuilder(jdeps, '--multi-release', java.toolchain.languageVersion.get().toString(),
|
||||||
|
'--ignore-missing-deps', '--print-module-deps', '-q', mainJar.get().asFile.absolutePath)
|
||||||
|
.redirectErrorStream(true).start()
|
||||||
|
def output = process.inputStream.text.trim()
|
||||||
|
|
||||||
|
if(process.waitFor() != 0) {
|
||||||
|
throw new GradleException("Module check: jdeps failed: ${output}")
|
||||||
|
}
|
||||||
|
|
||||||
|
def required = output.split(',')*.trim().findAll { it } as Set
|
||||||
|
|
||||||
|
rt.targetPlatforms.get().keySet().each { target ->
|
||||||
|
def release = new File(rt.imageDir.asFile, "${project.name}-${target}/release")
|
||||||
|
def match = release.text =~ /(?m)^MODULES="([^"]*)"/
|
||||||
|
|
||||||
|
if(!match.find()) {
|
||||||
|
throw new GradleException("Module check: no MODULES entry in ${release}")
|
||||||
|
}
|
||||||
|
|
||||||
|
def missing = required - (match.group(1).split(' ') as Set)
|
||||||
|
|
||||||
|
if(missing) {
|
||||||
|
throw new GradleException("Module check: runtime image [${target}] is missing required modules " +
|
||||||
|
"${missing.sort()} - add them to addModules() in build.gradle")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logger.lifecycle("Module check: runtime images contain all modules required by sdrtrunk: ${required.sort()}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -251,30 +466,35 @@ def configure(org.beryx.runtime.RuntimeZipTask rt, List<String> jvmArgs) {
|
|||||||
* Usage: gradlew runtimeZipCurrent (windows - using gradlew)
|
* Usage: gradlew runtimeZipCurrent (windows - using gradlew)
|
||||||
* Usage: ./gradlew runtimeZipCurrent (linux - using gradlew)
|
* Usage: ./gradlew runtimeZipCurrent (linux - using gradlew)
|
||||||
*/
|
*/
|
||||||
tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
|
tasks.register('runtimeZipCurrent', RuntimeZipTask) {rt ->
|
||||||
def arch = System.properties.getProperty("os.arch")
|
def arch = System.properties.getProperty("os.arch")
|
||||||
def javaHome = org.gradle.internal.jvm.Jvm.current().getJavaHome().toString()
|
def javaHome = Jvm.current().getJavaHome().toString()
|
||||||
|
|
||||||
if(os.isWindows()) {
|
if(os.isWindows()) {
|
||||||
rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
|
if(arch == "amd64") {
|
||||||
|
rt.extension.targetPlatform(targetWindowsX86_64, javaHome)
|
||||||
|
}
|
||||||
|
else if(arch == "aarch64") {
|
||||||
|
rt.extension.targetPlatform(targetWindowsAarch64, javaHome)
|
||||||
|
}
|
||||||
configure(rt, jvmArgsWindows)
|
configure(rt, jvmArgsWindows)
|
||||||
}
|
}
|
||||||
else if(os.isLinux())
|
else if(os.isLinux())
|
||||||
{
|
{
|
||||||
if(arch.equals("amd64")) {
|
if(arch == "amd64") {
|
||||||
rt.extension.targetPlatform(targetLinuxX86_64, javaHome)
|
rt.extension.targetPlatform(targetLinuxX86_64, javaHome)
|
||||||
}
|
}
|
||||||
else if(arch.equals("aarch64")) {
|
else if(arch == "aarch64") {
|
||||||
rt.extension.targetPlatform(targetLinuxAarch64, javaHome)
|
rt.extension.targetPlatform(targetLinuxAarch64, javaHome)
|
||||||
}
|
}
|
||||||
configure(rt, jvmArgsLinux)
|
configure(rt, jvmArgsLinux)
|
||||||
}
|
}
|
||||||
else if(os.isMacOsX())
|
else if(os.isMacOsX())
|
||||||
{
|
{
|
||||||
if(arch.equals("amd64")) {
|
if(arch == "amd64") {
|
||||||
rt.extension.targetPlatform(targetOsxX86_64, javaHome)
|
rt.extension.targetPlatform(targetOsxX86_64, javaHome)
|
||||||
}
|
}
|
||||||
else if(arch.equals("aarch64")) {
|
else if(arch == "aarch64") {
|
||||||
rt.extension.targetPlatform(targetOsxAarch64, javaHome)
|
rt.extension.targetPlatform(targetOsxAarch64, javaHome)
|
||||||
}
|
}
|
||||||
configure(rt, jvmArgsLinux)
|
configure(rt, jvmArgsLinux)
|
||||||
@@ -291,14 +511,14 @@ tasks.register('runtimeZipCurrent', org.beryx.runtime.RuntimeZipTask) {rt ->
|
|||||||
* Usage: gradlew runtimeZipWindows (windows - using gradlew)
|
* Usage: gradlew runtimeZipWindows (windows - using gradlew)
|
||||||
* Usage: ./gradlew runtimeZipWindows (linux - using gradlew)
|
* Usage: ./gradlew runtimeZipWindows (linux - using gradlew)
|
||||||
*/
|
*/
|
||||||
tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
|
tasks.register('runtimeZipWindows', RuntimeZipTask) {rt ->
|
||||||
if(file(jdk_windows_x86_64).exists()) {
|
//Windows aarch64
|
||||||
rt.extension.targetPlatform(targetWindowsX86_64, jdk_windows_x86_64, [])
|
rt.extension.targetPlatform(targetWindowsAarch64) {
|
||||||
|
jdkHome = jdkDownload(jdk_download_windows_aarch64)
|
||||||
}
|
}
|
||||||
else {
|
//Windows x86-64
|
||||||
rt.extension.targetPlatform(targetWindowsX86_64) {
|
rt.extension.targetPlatform(targetWindowsX86_64) {
|
||||||
jdkHome = jdkDownload(jdk_download_windows_x86_64)
|
jdkHome = jdkDownload(jdk_download_windows_x86_64)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
configure(rt, jvmArgsWindows)
|
configure(rt, jvmArgsWindows)
|
||||||
@@ -313,43 +533,23 @@ tasks.register('runtimeZipWindows', org.beryx.runtime.RuntimeZipTask) {rt ->
|
|||||||
* Usage: gradlew runtimeZipOthers (windows - using gradlew)
|
* Usage: gradlew runtimeZipOthers (windows - using gradlew)
|
||||||
* Usage: ./gradlew runtimeZipOthers (linux - using gradlew)
|
* Usage: ./gradlew runtimeZipOthers (linux - using gradlew)
|
||||||
*/
|
*/
|
||||||
tasks.register('runtimeZipOthers', org.beryx.runtime.RuntimeZipTask) {rt ->
|
tasks.register('runtimeZipOthers', RuntimeZipTask) {rt ->
|
||||||
//Linux aarch64
|
//Linux aarch64
|
||||||
if(file(jdk_linux_aarch64).exists()) {
|
rt.extension.targetPlatform(targetLinuxAarch64) {
|
||||||
rt.extension.targetPlatform(targetLinuxAarch64, jdk_linux_aarch64, [])
|
jdkHome = jdkDownload(jdk_download_linux_aarch64)
|
||||||
}
|
|
||||||
else {
|
|
||||||
rt.extension.targetPlatform(targetLinuxAarch64) {
|
|
||||||
jdkHome = jdkDownload(jdk_download_linux_aarch64)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//Linux x86-64
|
//Linux x86-64
|
||||||
if(file(jdk_linux_x86_64).exists()) {
|
rt.extension.targetPlatform(targetLinuxX86_64) {
|
||||||
rt.extension.targetPlatform(targetLinuxX86_64, jdk_linux_x86_64, [])
|
jdkHome = jdkDownload(jdk_download_linux_x86_64)
|
||||||
}
|
|
||||||
else {
|
|
||||||
rt.extension.targetPlatform(targetLinuxX86_64) {
|
|
||||||
jdkHome = jdkDownload(jdk_download_linux_x86_64)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//OSX aarch64
|
//OSX aarch64
|
||||||
if(file(jdk_osx_aarch64).exists()) {
|
rt.extension.targetPlatform(targetOsxAarch64) {
|
||||||
rt.extension.targetPlatform(targetOsxAarch64, jdk_osx_aarch64, [])
|
jdkHome = jdkDownload(jdk_download_osx_aarch64)
|
||||||
}
|
|
||||||
else {
|
|
||||||
rt.extension.targetPlatform(targetOsxAarch64) {
|
|
||||||
jdkHome = jdkDownload(jdk_download_osx_aarch64)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
//OSX x86-64
|
//OSX x86-64
|
||||||
if(file(jdk_osx_x86_64).exists()) {
|
rt.extension.targetPlatform(targetOsxX86_64) {
|
||||||
rt.extension.targetPlatform(targetOsxX86_64, jdk_osx_x86_64, [])
|
jdkHome = jdkDownload(jdk_download_osx_x86_64)
|
||||||
}
|
|
||||||
else {
|
|
||||||
rt.extension.targetPlatform(targetOsxX86_64) {
|
|
||||||
jdkHome = jdkDownload(jdk_download_osx_x86_64)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
configure(rt, jvmArgsLinux);
|
configure(rt, jvmArgsLinux)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# ******************************************************************************
|
# ******************************************************************************
|
||||||
# Copyright (C) 2014-2024 Dennis Sheirer
|
# Copyright (C) 2014-2026 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
|
||||||
@@ -17,15 +17,16 @@
|
|||||||
# *****************************************************************************
|
# *****************************************************************************
|
||||||
#
|
#
|
||||||
|
|
||||||
# Version naming conventions:
|
# The project version is no longer defined here. It is derived from the most recent 'v<version>' git tag (see
|
||||||
# Alpha: maj.min.patch-alpha-build
|
# build.gradle) and can be overridden with -PprojectVersion=<version>.
|
||||||
# Beta: maj.min.patch-beta-build
|
|
||||||
# Release: maj.min.patch
|
|
||||||
#
|
#
|
||||||
# Example: 0.6.0-beta-5
|
# Version tag naming conventions:
|
||||||
|
# Alpha: vmaj.min.patch-alpha-build
|
||||||
|
# Beta: vmaj.min.patch-beta-build
|
||||||
|
# Release: vmaj.min.patch
|
||||||
#
|
#
|
||||||
# Note: this is so that the file names for the resultant release build products match the GitLab release asset
|
# Example: v0.6.0-beta-5
|
||||||
|
#
|
||||||
|
# Note: this is so that the file names for the resultant release build products match the GitHub release asset
|
||||||
# tag name, specifically the dashes inserted before and after the alpha/beta labels.
|
# tag name, specifically the dashes inserted before and after the alpha/beta labels.
|
||||||
# See: https://github.com/DSheirer/sdrtrunk/issues/1651
|
# See: https://github.com/DSheirer/sdrtrunk/issues/1651
|
||||||
|
|
||||||
projectVersion=0.6.1-beta-2
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
23
gradle/wrapper/gradle-wrapper.properties
vendored
23
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,26 +1,9 @@
|
|||||||
#
|
|
||||||
# ******************************************************************************
|
|
||||||
# Copyright (C) 2014-2024 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/>
|
|
||||||
# *****************************************************************************
|
|
||||||
#
|
|
||||||
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.9.0-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
retries=0
|
||||||
|
retryBackOffMs=500
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
53
gradlew
vendored
53
gradlew
vendored
@@ -1,27 +1,26 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# ******************************************************************************
|
# Copyright © 2015 the original authors.
|
||||||
# Copyright (C) 2014-2024 Dennis Sheirer
|
|
||||||
#
|
#
|
||||||
# This program is free software: you can redistribute it and/or modify
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# it under the terms of the GNU General Public License as published by
|
# you may not use this file except in compliance with the License.
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
# You may obtain a copy of the License at
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# https://www.apache.org/licenses/LICENSE-2.0
|
||||||
# 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
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
# *****************************************************************************
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
#
|
#
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
# gradlew start up script for POSIX generated by Gradle.
|
||||||
#
|
#
|
||||||
# Important for running:
|
# Important for running:
|
||||||
#
|
#
|
||||||
@@ -30,7 +29,7 @@
|
|||||||
# bash, then to run this script, type that shell name before the whole
|
# bash, then to run this script, type that shell name before the whole
|
||||||
# command line, like:
|
# command line, like:
|
||||||
#
|
#
|
||||||
# ksh Gradle
|
# ksh gradlew
|
||||||
#
|
#
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
# requires all of these POSIX shell features:
|
# requires all of these POSIX shell features:
|
||||||
@@ -58,7 +57,7 @@
|
|||||||
# Darwin, MinGW, and NonStop.
|
# Darwin, MinGW, and NonStop.
|
||||||
#
|
#
|
||||||
# (3) This script is generated from the Groovy template
|
# (3) This script is generated from the Groovy template
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
# within the Gradle project.
|
# within the Gradle project.
|
||||||
#
|
#
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
@@ -86,7 +85,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -114,7 +114,6 @@ case "$( uname )" in #(
|
|||||||
NONSTOP* ) nonstop=true ;;
|
NONSTOP* ) nonstop=true ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
# Determine the Java command to use to start the JVM.
|
||||||
@@ -147,7 +146,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -155,7 +154,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -172,7 +171,6 @@ fi
|
|||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
if "$cygwin" || "$msys" ; then
|
if "$cygwin" || "$msys" ; then
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
@@ -204,16 +202,15 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command:
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
-classpath "$CLASSPATH" \
|
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
"$@"
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
# Stop when "xargs" is not available.
|
||||||
|
|||||||
88
gradlew.bat
vendored
88
gradlew.bat
vendored
@@ -13,16 +13,45 @@
|
|||||||
@rem See the License for the specific language governing permissions and
|
@rem See the License for the specific language governing permissions and
|
||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
@rem SPDX-License-Identifier: Apache-2.0
|
||||||
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem gradlew startup script for Windows
|
||||||
@rem
|
@rem
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
@rem Set local scope for the variables, and ensure extensions are enabled
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
setlocal EnableExtensions
|
||||||
|
|
||||||
|
@rem Catch executions from older scripts and ensure they exit cleanly.
|
||||||
|
@rem This can be removed once we can be reasonably confident that few people
|
||||||
|
@rem will be migrating directly to this new wrapper.
|
||||||
|
goto afterSafetyNet
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||||
|
goto exitWithErrorLevel
|
||||||
|
:afterSafetyNet
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
@@ -43,13 +72,14 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
1>&2 echo.
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
1>&2 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
echo.
|
1>&2 echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
1>&2 echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation.
|
1>&2 echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
"%COMSPEC%" /c exit 1
|
||||||
|
goto exitWithErrorLevel
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
:findJavaFromJavaHome
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
set JAVA_HOME=%JAVA_HOME:"=%
|
||||||
@@ -57,36 +87,26 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
1>&2 echo.
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
1>&2 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
||||||
echo.
|
1>&2 echo.
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
1>&2 echo Please set the JAVA_HOME variable in your environment to match the
|
||||||
echo location of your Java installation.
|
1>&2 echo location of your Java installation.
|
||||||
|
|
||||||
goto fail
|
"%COMSPEC%" /c exit 1
|
||||||
|
goto exitWithErrorLevel
|
||||||
|
|
||||||
:execute
|
:execute
|
||||||
@rem Setup the command line
|
@rem Setup the command line
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
@rem Execute gradlew
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
@rem endlocal doesn't take effect until after the line is parsed and variables are expanded
|
||||||
|
@rem which allows us to clear the local environment before executing the java command
|
||||||
|
endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel & goto exitWithErrorLevel
|
||||||
|
|
||||||
:end
|
@rem This label must not be changed. We rely on old scripts being able to jump to this point.
|
||||||
@rem End local scope for the variables with windows NT shell
|
:exitWithErrorLevel
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts
|
||||||
|
"%COMSPEC%" /c exit %ERRORLEVEL%
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
|
||||||
exit /b %EXIT_CODE%
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
|
|||||||
1023
sdr-trunk.ipr
1023
sdr-trunk.ipr
File diff suppressed because it is too large
Load Diff
@@ -1 +1,95 @@
|
|||||||
|
plugins {
|
||||||
|
id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
|
||||||
|
}
|
||||||
rootProject.name = 'sdr-trunk'
|
rootProject.name = 'sdr-trunk'
|
||||||
|
|
||||||
|
dependencyResolutionManagement {
|
||||||
|
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
maven { url = 'https://jitpack.io' }
|
||||||
|
|
||||||
|
//jAirspy is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jAirspy/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jairspy' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jAirspyHF is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jAirspyHF/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jairspyhf' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jRTL is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jRTL/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jrtl' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jlibusb is published as a GitHub release, with libusb for all platforms in the jar. Tuner libraries built on
|
||||||
|
//jlibusb (jAirspy, jAirspyHF, jBladeRF, jHackRF, jHydraSDR, jLimeSDR, jRTL) load their native library next to its libusb, so the process shares one copy.
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jlibusb/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jlibusb' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jHackRF is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jHackRF/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jhackrf' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jHydraSDR is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jHydraSDR/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jhydrasdr' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jLimeSDR is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jLimeSDR/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jlimesdr' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jsdrplay is published as a GitHub release. The jar does not contain the SDRplay API native library, which
|
||||||
|
//users install separately from sdrplay.com
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jsdrplay/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jsdrplay' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//jBladeRF is published as a GitHub release, with the native libraries for all platforms in the jar
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/jBladeRF/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'jbladerf' }
|
||||||
|
}
|
||||||
|
|
||||||
|
//radio-reference-api is published as a GitHub release. Its dependencies (jackson-dataformat-xml, slf4j-api)
|
||||||
|
//are not pulled in transitively and are declared directly in build.gradle
|
||||||
|
ivy {
|
||||||
|
url = 'https://github.com/DSheirer/radio-reference-api/releases/download'
|
||||||
|
patternLayout { artifact 'v[revision]/[artifact]-[revision].[ext]' }
|
||||||
|
metadataSources { artifact() }
|
||||||
|
content { includeModule 'io.github.dsheirer', 'radio-reference-api' }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 com.sun.java.swing.plaf.windows;
|
||||||
|
|
||||||
|
import javax.swing.LookAndFeel;
|
||||||
|
import javax.swing.UIDefaults;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* No-op stub for the JDK's Windows look-and-feel.
|
||||||
|
*
|
||||||
|
* <p>JIDE 3.6.18's {@code LookAndFeelFactory} contains compile-time
|
||||||
|
* {@code instanceof com.sun.java.swing.plaf.windows.WindowsLookAndFeel} checks throughout its
|
||||||
|
* dispatch logic. On Linux and macOS JDK builds that class is genuinely absent from
|
||||||
|
* {@code java.desktop}, so the JVM throws {@link NoClassDefFoundError} the first time JIDE's
|
||||||
|
* dispatch code executes the {@code instanceof} bytecode. That happens during
|
||||||
|
* {@link com.jidesoft.swing.JideSplitPane#updateUI()} on every LAF change.
|
||||||
|
*
|
||||||
|
* <p>This stub lives in the classpath so the class reference resolves on non-Windows JDKs.
|
||||||
|
* On Windows JDK builds the real {@code WindowsLookAndFeel} is loaded from the
|
||||||
|
* {@code java.desktop} module via the boot class loader and shadows this class.
|
||||||
|
*
|
||||||
|
* <p>The stub reports itself as not native and not supported - JIDE never instantiates this
|
||||||
|
* class, it only uses it for {@code instanceof} comparisons against the active LAF. Since
|
||||||
|
* sdrtrunk never installs this LAF, the {@code instanceof} check always returns false and
|
||||||
|
* JIDE proceeds to its next branch.
|
||||||
|
*/
|
||||||
|
public class WindowsLookAndFeel extends LookAndFeel
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public String getName()
|
||||||
|
{
|
||||||
|
return "Windows (stub)";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getID()
|
||||||
|
{
|
||||||
|
return "WindowsStub";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getDescription()
|
||||||
|
{
|
||||||
|
return "Compatibility stub for JIDE's instanceof checks on non-Windows JDKs.";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isNativeLookAndFeel()
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isSupportedLookAndFeel()
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public UIDefaults getDefaults()
|
||||||
|
{
|
||||||
|
return new UIDefaults();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 io.github.dsheirer.alias;
|
package io.github.dsheirer.alias;
|
||||||
|
|
||||||
@@ -30,13 +27,22 @@ import io.github.dsheirer.alias.id.AliasIDType;
|
|||||||
import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
|
import io.github.dsheirer.alias.id.broadcast.BroadcastChannel;
|
||||||
import io.github.dsheirer.alias.id.priority.Priority;
|
import io.github.dsheirer.alias.id.priority.Priority;
|
||||||
import io.github.dsheirer.alias.id.record.Record;
|
import io.github.dsheirer.alias.id.record.Record;
|
||||||
|
import io.github.dsheirer.alias.id.talkgroup.StreamAsTalkgroup;
|
||||||
|
import java.awt.Color;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.TreeSet;
|
||||||
import javafx.beans.Observable;
|
import javafx.beans.Observable;
|
||||||
import javafx.beans.binding.Bindings;
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.beans.binding.BooleanBinding;
|
import javafx.beans.binding.BooleanBinding;
|
||||||
import javafx.beans.property.BooleanProperty;
|
import javafx.beans.property.BooleanProperty;
|
||||||
import javafx.beans.property.IntegerProperty;
|
import javafx.beans.property.IntegerProperty;
|
||||||
|
import javafx.beans.property.ObjectProperty;
|
||||||
import javafx.beans.property.SimpleBooleanProperty;
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
import javafx.beans.property.SimpleIntegerProperty;
|
import javafx.beans.property.SimpleIntegerProperty;
|
||||||
|
import javafx.beans.property.SimpleObjectProperty;
|
||||||
import javafx.beans.property.SimpleStringProperty;
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
import javafx.beans.property.StringProperty;
|
import javafx.beans.property.StringProperty;
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
@@ -46,13 +52,6 @@ import javafx.util.Callback;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.awt.Color;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.TreeSet;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Alias provides an aliasing (e.g. name, color, etc) container that is linked to multiple alias identifiers and
|
* Alias provides an aliasing (e.g. name, color, etc) container that is linked to multiple alias identifiers and
|
||||||
* provides a corresponding set of actions related to the alias.
|
* provides a corresponding set of actions related to the alias.
|
||||||
@@ -74,6 +73,7 @@ public class Alias
|
|||||||
private StringProperty mName = new SimpleStringProperty();
|
private StringProperty mName = new SimpleStringProperty();
|
||||||
private ObservableList<AliasID> mAliasIDs = FXCollections.observableArrayList();
|
private ObservableList<AliasID> mAliasIDs = FXCollections.observableArrayList();
|
||||||
private ObservableList<AliasAction> mAliasActions = FXCollections.observableArrayList();
|
private ObservableList<AliasAction> mAliasActions = FXCollections.observableArrayList();
|
||||||
|
private ObjectProperty<StreamAsTalkgroup> mStreamTalkgroupAlias = new SimpleObjectProperty<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance and sets the specified name.
|
* Constructs an instance and sets the specified name.
|
||||||
@@ -180,6 +180,12 @@ public class Alias
|
|||||||
return mColor;
|
return mColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public ObjectProperty streamTalkgroupAliasProperty()
|
||||||
|
{
|
||||||
|
return mStreamTalkgroupAlias;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Icon name property
|
* Icon name property
|
||||||
*/
|
*/
|
||||||
@@ -229,6 +235,24 @@ public class Alias
|
|||||||
mName.set(name);
|
mName.set(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Alias name
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "stream_talkgroup_alias")
|
||||||
|
public StreamAsTalkgroup getStreamTalkgroupAlias()
|
||||||
|
{
|
||||||
|
return mStreamTalkgroupAlias.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the stream as talkgroup value that will be used in the TO field for streamed audio calls.
|
||||||
|
* @param streamTalkgroupAlias with a talkgroup value.
|
||||||
|
*/
|
||||||
|
public void setStreamTalkgroupAlias(StreamAsTalkgroup streamTalkgroupAlias)
|
||||||
|
{
|
||||||
|
mStreamTalkgroupAlias.set(streamTalkgroupAlias);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Alias list name for the alias list that this alias belongs to
|
* Alias list name for the alias list that this alias belongs to
|
||||||
*/
|
*/
|
||||||
@@ -710,6 +734,7 @@ public class Alias
|
|||||||
{
|
{
|
||||||
return (Alias a) -> new Observable[] {a.recordableProperty(), a.streamableProperty(), a.colorProperty(),
|
return (Alias a) -> new Observable[] {a.recordableProperty(), a.streamableProperty(), a.colorProperty(),
|
||||||
a.aliasListNameProperty(), a.groupProperty(), a.iconNameProperty(), a.nameProperty(), a.aliasIds(),
|
a.aliasListNameProperty(), a.groupProperty(), a.iconNameProperty(), a.nameProperty(), a.aliasIds(),
|
||||||
a.aliasActions(), a.nonAudioIdentifierCountProperty(), a.overlapProperty()};
|
a.aliasActions(), a.nonAudioIdentifierCountProperty(), a.overlapProperty(), a.priorityProperty(),
|
||||||
|
a.streamTalkgroupAliasProperty()};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,12 +30,16 @@ import io.github.dsheirer.alias.id.legacy.mobileID.Min;
|
|||||||
import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
|
import io.github.dsheirer.alias.id.legacy.siteID.SiteID;
|
||||||
import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
|
import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
|
||||||
import io.github.dsheirer.alias.id.priority.Priority;
|
import io.github.dsheirer.alias.id.priority.Priority;
|
||||||
|
import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
|
||||||
|
import io.github.dsheirer.alias.id.radio.NXDNTypeDRadioRange;
|
||||||
import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
|
import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
|
||||||
import io.github.dsheirer.alias.id.radio.Radio;
|
import io.github.dsheirer.alias.id.radio.Radio;
|
||||||
import io.github.dsheirer.alias.id.radio.RadioRange;
|
import io.github.dsheirer.alias.id.radio.RadioRange;
|
||||||
import io.github.dsheirer.alias.id.record.Record;
|
import io.github.dsheirer.alias.id.record.Record;
|
||||||
import io.github.dsheirer.alias.id.status.UnitStatusID;
|
import io.github.dsheirer.alias.id.status.UnitStatusID;
|
||||||
import io.github.dsheirer.alias.id.status.UserStatusID;
|
import io.github.dsheirer.alias.id.status.UserStatusID;
|
||||||
|
import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroup;
|
||||||
|
import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroupRange;
|
||||||
import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
|
import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
|
||||||
import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
|
import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
|
||||||
import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
|
import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
|
||||||
@@ -79,6 +83,31 @@ public class AliasFactory
|
|||||||
Min copyMin = new Min();
|
Min copyMin = new Min();
|
||||||
copyMin.setMin(originalMin.getMin());
|
copyMin.setMin(originalMin.getMin());
|
||||||
return copyMin;
|
return copyMin;
|
||||||
|
case NXDN_TYPE_D_RADIO_ID:
|
||||||
|
NXDNTypeDRadio originalTypeDRadio = (NXDNTypeDRadio)id;
|
||||||
|
NXDNTypeDRadio copyTypeDRadio = new NXDNTypeDRadio(originalTypeDRadio.getHomeRepeater(),
|
||||||
|
originalTypeDRadio.getIdentifier());
|
||||||
|
copyTypeDRadio.setOverlap(originalTypeDRadio.overlapProperty().get());
|
||||||
|
return copyTypeDRadio;
|
||||||
|
case NXDN_TYPE_D_RADIO_ID_RANGE:
|
||||||
|
NXDNTypeDRadioRange originalTypeDRadioRange = (NXDNTypeDRadioRange)id;
|
||||||
|
NXDNTypeDRadioRange copyTypeDRadioRange = new NXDNTypeDRadioRange(originalTypeDRadioRange.getHomeRepeater(),
|
||||||
|
originalTypeDRadioRange.getMinIdentifier(), originalTypeDRadioRange.getMaxIdentifier());
|
||||||
|
copyTypeDRadioRange.setOverlap(originalTypeDRadioRange.overlapProperty().get());
|
||||||
|
return copyTypeDRadioRange;
|
||||||
|
case NXDN_TYPE_D_TALKGROUP:
|
||||||
|
NXDNTypeDTalkgroup originalTypeDTalkgroup = (NXDNTypeDTalkgroup)id;
|
||||||
|
NXDNTypeDTalkgroup copyTypeDTalkgroup = new NXDNTypeDTalkgroup(originalTypeDTalkgroup.getHomeRepeater(),
|
||||||
|
originalTypeDTalkgroup.getIdentifier());
|
||||||
|
copyTypeDTalkgroup.setOverlap(originalTypeDTalkgroup.overlapProperty().get());
|
||||||
|
return copyTypeDTalkgroup;
|
||||||
|
case NXDN_TYPE_D_TALKGROUP_RANGE:
|
||||||
|
NXDNTypeDTalkgroupRange originalTypeDTalkgroupRange = (NXDNTypeDTalkgroupRange)id;
|
||||||
|
NXDNTypeDTalkgroupRange copyTypeDTalkgroupRange = new NXDNTypeDTalkgroupRange(
|
||||||
|
originalTypeDTalkgroupRange.getHomeRepeater(), originalTypeDTalkgroupRange.getMinIdentifier(),
|
||||||
|
originalTypeDTalkgroupRange.getMaxIdentifier());
|
||||||
|
copyTypeDTalkgroupRange.setOverlap(originalTypeDTalkgroupRange.overlapProperty().get());
|
||||||
|
return copyTypeDTalkgroupRange;
|
||||||
case P25_FULLY_QUALIFIED_RADIO_ID:
|
case P25_FULLY_QUALIFIED_RADIO_ID:
|
||||||
P25FullyQualifiedRadio originalP25 = (P25FullyQualifiedRadio) id;
|
P25FullyQualifiedRadio originalP25 = (P25FullyQualifiedRadio) id;
|
||||||
P25FullyQualifiedRadio copyP25 = new P25FullyQualifiedRadio(originalP25.getWacn(),
|
P25FullyQualifiedRadio copyP25 = new P25FullyQualifiedRadio(originalP25.getWacn(),
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ import io.github.dsheirer.identifier.talkgroup.FullyQualifiedTalkgroupIdentifier
|
|||||||
import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
|
import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
|
||||||
import io.github.dsheirer.identifier.tone.ToneIdentifier;
|
import io.github.dsheirer.identifier.tone.ToneIdentifier;
|
||||||
import io.github.dsheirer.identifier.tone.ToneSequence;
|
import io.github.dsheirer.identifier.tone.ToneSequence;
|
||||||
import io.github.dsheirer.module.decode.dcs.DCSCode;
|
import io.github.dsheirer.module.decode.squelch.dcs.DCSCode;
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
@@ -134,6 +134,7 @@ public class AliasList
|
|||||||
switch(id.getType())
|
switch(id.getType())
|
||||||
{
|
{
|
||||||
case TALKGROUP:
|
case TALKGROUP:
|
||||||
|
case NXDN_TYPE_D_TALKGROUP:
|
||||||
Talkgroup talkgroup = (Talkgroup)id;
|
Talkgroup talkgroup = (Talkgroup)id;
|
||||||
|
|
||||||
TalkgroupAliasList talkgroupAliasList = mTalkgroupProtocolMap.get(talkgroup.getProtocol());
|
TalkgroupAliasList talkgroupAliasList = mTalkgroupProtocolMap.get(talkgroup.getProtocol());
|
||||||
@@ -147,6 +148,7 @@ public class AliasList
|
|||||||
talkgroupAliasList.add(talkgroup, alias);
|
talkgroupAliasList.add(talkgroup, alias);
|
||||||
break;
|
break;
|
||||||
case TALKGROUP_RANGE:
|
case TALKGROUP_RANGE:
|
||||||
|
case NXDN_TYPE_D_TALKGROUP_RANGE:
|
||||||
TalkgroupRange talkgroupRange = (TalkgroupRange)id;
|
TalkgroupRange talkgroupRange = (TalkgroupRange)id;
|
||||||
|
|
||||||
TalkgroupAliasList talkgroupRangeAliasList = mTalkgroupProtocolMap.get(talkgroupRange.getProtocol());
|
TalkgroupAliasList talkgroupRangeAliasList = mTalkgroupProtocolMap.get(talkgroupRange.getProtocol());
|
||||||
@@ -186,6 +188,7 @@ public class AliasList
|
|||||||
p25TalkgroupAliasList.add(qualifiedTalkgroup, alias);
|
p25TalkgroupAliasList.add(qualifiedTalkgroup, alias);
|
||||||
break;
|
break;
|
||||||
case RADIO_ID:
|
case RADIO_ID:
|
||||||
|
case NXDN_TYPE_D_RADIO_ID:
|
||||||
Radio radio = (Radio)id;
|
Radio radio = (Radio)id;
|
||||||
|
|
||||||
RadioAliasList radioAliasList = mRadioProtocolMap.get(radio.getProtocol());
|
RadioAliasList radioAliasList = mRadioProtocolMap.get(radio.getProtocol());
|
||||||
@@ -199,6 +202,7 @@ public class AliasList
|
|||||||
radioAliasList.add(radio, alias);
|
radioAliasList.add(radio, alias);
|
||||||
break;
|
break;
|
||||||
case RADIO_ID_RANGE:
|
case RADIO_ID_RANGE:
|
||||||
|
case NXDN_TYPE_D_RADIO_ID_RANGE:
|
||||||
RadioRange radioRange = (RadioRange)id;
|
RadioRange radioRange = (RadioRange)id;
|
||||||
|
|
||||||
RadioAliasList radioRangeAliasList = mRadioProtocolMap.get(radioRange.getProtocol());
|
RadioAliasList radioRangeAliasList = mRadioProtocolMap.get(radioRange.getProtocol());
|
||||||
|
|||||||
@@ -0,0 +1,269 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
|
import javafx.beans.Observable;
|
||||||
|
import javafx.beans.property.BooleanProperty;
|
||||||
|
import javafx.beans.property.IntegerProperty;
|
||||||
|
import javafx.beans.property.LongProperty;
|
||||||
|
import javafx.beans.property.SimpleBooleanProperty;
|
||||||
|
import javafx.beans.property.SimpleIntegerProperty;
|
||||||
|
import javafx.beans.property.SimpleLongProperty;
|
||||||
|
import javafx.beans.property.SimpleStringProperty;
|
||||||
|
import javafx.beans.property.StringProperty;
|
||||||
|
import javafx.util.Callback;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Persisted settings for an alias list. Alias lists are otherwise identified only by the list name that each alias
|
||||||
|
* carries, so settings that belong to the list itself, like tracking a Radio Reference system, are stored here and
|
||||||
|
* saved in the playlist.
|
||||||
|
*
|
||||||
|
* Radio Reference tracking uses two timestamps from the Radio Reference system's last updated value: the last updated
|
||||||
|
* value seen by the most recent check, and the last updated value that the aliases were synchronized to. When the
|
||||||
|
* seen value is newer than the synchronized value, the system changed on Radio Reference and the aliases haven't
|
||||||
|
* been updated yet.
|
||||||
|
*/
|
||||||
|
public class AliasListConfiguration
|
||||||
|
{
|
||||||
|
public static final int NO_SYSTEM = 0;
|
||||||
|
|
||||||
|
private StringProperty mName = new SimpleStringProperty();
|
||||||
|
private IntegerProperty mRadioReferenceSystemId = new SimpleIntegerProperty(NO_SYSTEM);
|
||||||
|
private StringProperty mRadioReferenceSystemName = new SimpleStringProperty();
|
||||||
|
private BooleanProperty mAutoUpdate = new SimpleBooleanProperty();
|
||||||
|
private LongProperty mRadioReferenceLastUpdated = new SimpleLongProperty();
|
||||||
|
private LongProperty mSynchronizedLastUpdated = new SimpleLongProperty();
|
||||||
|
private LongProperty mLastChecked = new SimpleLongProperty();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Jackson constructor
|
||||||
|
*/
|
||||||
|
public AliasListConfiguration()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param name of the alias list
|
||||||
|
*/
|
||||||
|
public AliasListConfiguration(String name)
|
||||||
|
{
|
||||||
|
setName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extractor so that observable lists of configurations report changes to the persisted properties.
|
||||||
|
*/
|
||||||
|
public static Callback<AliasListConfiguration,Observable[]> extractor()
|
||||||
|
{
|
||||||
|
return (AliasListConfiguration c) -> new Observable[] {c.mName, c.mRadioReferenceSystemId,
|
||||||
|
c.mRadioReferenceSystemName, c.mAutoUpdate, c.mRadioReferenceLastUpdated, c.mSynchronizedLastUpdated,
|
||||||
|
c.mLastChecked};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Alias list name
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "name")
|
||||||
|
public String getName()
|
||||||
|
{
|
||||||
|
return mName.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setName(String name)
|
||||||
|
{
|
||||||
|
mName.set(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public StringProperty nameProperty()
|
||||||
|
{
|
||||||
|
return mName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if this alias list tracks a Radio Reference system.
|
||||||
|
*/
|
||||||
|
@JsonIgnore
|
||||||
|
public boolean isTrackingRadioReferenceSystem()
|
||||||
|
{
|
||||||
|
return getRadioReferenceSystemId() > NO_SYSTEM;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if this alias list tracks the specified Radio Reference system.
|
||||||
|
*/
|
||||||
|
public boolean isTracking(int systemId)
|
||||||
|
{
|
||||||
|
return systemId > NO_SYSTEM && getRadioReferenceSystemId() == systemId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Radio Reference system ID tracked by this alias list, or NO_SYSTEM (0).
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "rr_system_id")
|
||||||
|
public int getRadioReferenceSystemId()
|
||||||
|
{
|
||||||
|
return mRadioReferenceSystemId.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRadioReferenceSystemId(int systemId)
|
||||||
|
{
|
||||||
|
mRadioReferenceSystemId.set(systemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public IntegerProperty radioReferenceSystemIdProperty()
|
||||||
|
{
|
||||||
|
return mRadioReferenceSystemId;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Radio Reference system name, for display.
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "rr_system_name")
|
||||||
|
public String getRadioReferenceSystemName()
|
||||||
|
{
|
||||||
|
return mRadioReferenceSystemName.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRadioReferenceSystemName(String name)
|
||||||
|
{
|
||||||
|
mRadioReferenceSystemName.set(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public StringProperty radioReferenceSystemNameProperty()
|
||||||
|
{
|
||||||
|
return mRadioReferenceSystemName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if talkgroups are automatically added or updated as aliases when the system changes on Radio Reference.
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "rr_auto_update")
|
||||||
|
public boolean isAutoUpdate()
|
||||||
|
{
|
||||||
|
return mAutoUpdate.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setAutoUpdate(boolean autoUpdate)
|
||||||
|
{
|
||||||
|
mAutoUpdate.set(autoUpdate);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public BooleanProperty autoUpdateProperty()
|
||||||
|
{
|
||||||
|
return mAutoUpdate;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Radio Reference last updated timestamp (ms since epoch) for the system, as seen by the most recent check.
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "rr_last_updated")
|
||||||
|
public long getRadioReferenceLastUpdated()
|
||||||
|
{
|
||||||
|
return mRadioReferenceLastUpdated.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRadioReferenceLastUpdated(long timestamp)
|
||||||
|
{
|
||||||
|
mRadioReferenceLastUpdated.set(timestamp);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public LongProperty radioReferenceLastUpdatedProperty()
|
||||||
|
{
|
||||||
|
return mRadioReferenceLastUpdated;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Radio Reference last updated timestamp (ms since epoch) that the aliases were last synchronized to.
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "rr_synchronized")
|
||||||
|
public long getSynchronizedLastUpdated()
|
||||||
|
{
|
||||||
|
return mSynchronizedLastUpdated.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSynchronizedLastUpdated(long timestamp)
|
||||||
|
{
|
||||||
|
mSynchronizedLastUpdated.set(timestamp);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public LongProperty synchronizedLastUpdatedProperty()
|
||||||
|
{
|
||||||
|
return mSynchronizedLastUpdated;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Time (ms since epoch) of the most recent successful check of the system on Radio Reference.
|
||||||
|
*/
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "rr_last_checked")
|
||||||
|
public long getLastChecked()
|
||||||
|
{
|
||||||
|
return mLastChecked.get();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLastChecked(long timestamp)
|
||||||
|
{
|
||||||
|
mLastChecked.set(timestamp);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
public LongProperty lastCheckedProperty()
|
||||||
|
{
|
||||||
|
return mLastChecked;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if the most recent check saw a system change on Radio Reference that the aliases don't include yet.
|
||||||
|
*/
|
||||||
|
@JsonIgnore
|
||||||
|
public boolean isUpdateAvailable()
|
||||||
|
{
|
||||||
|
return isTrackingRadioReferenceSystem() && getRadioReferenceLastUpdated() > getSynchronizedLastUpdated();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Starts tracking the Radio Reference system. Clears timestamps so that the next refresh synchronizes.
|
||||||
|
*/
|
||||||
|
public void track(int systemId, String systemName)
|
||||||
|
{
|
||||||
|
setRadioReferenceSystemId(systemId);
|
||||||
|
setRadioReferenceSystemName(systemName);
|
||||||
|
setRadioReferenceLastUpdated(0);
|
||||||
|
setSynchronizedLastUpdated(0);
|
||||||
|
setLastChecked(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops tracking any Radio Reference system.
|
||||||
|
*/
|
||||||
|
public void stopTracking()
|
||||||
|
{
|
||||||
|
track(NO_SYSTEM, null);
|
||||||
|
setAutoUpdate(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2024 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
|
||||||
@@ -46,6 +46,8 @@ public class AliasModel
|
|||||||
private ObservableList<Alias> mAliases = FXCollections.observableArrayList(Alias.extractor());
|
private ObservableList<Alias> mAliases = FXCollections.observableArrayList(Alias.extractor());
|
||||||
private ObservableList<String> mAliasListNames = FXCollections.observableArrayList();
|
private ObservableList<String> mAliasListNames = FXCollections.observableArrayList();
|
||||||
private Map<String,AliasList> mAliasListMap = new HashMap<>();
|
private Map<String,AliasList> mAliasListMap = new HashMap<>();
|
||||||
|
private ObservableList<AliasListConfiguration> mAliasListConfigurations =
|
||||||
|
FXCollections.observableArrayList(AliasListConfiguration.extractor());
|
||||||
|
|
||||||
public AliasModel()
|
public AliasModel()
|
||||||
{
|
{
|
||||||
@@ -63,6 +65,187 @@ public class AliasModel
|
|||||||
return mAliasListNames;
|
return mAliasListNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Observable list of persisted alias list configurations. Only alias lists with settings, like Radio Reference
|
||||||
|
* system tracking, have a configuration.
|
||||||
|
*/
|
||||||
|
public ObservableList<AliasListConfiguration> aliasListConfigurations()
|
||||||
|
{
|
||||||
|
return mAliasListConfigurations;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Bulk loading of alias list configurations from a playlist. Ignores configurations without a name and
|
||||||
|
* duplicates of an earlier configuration's name.
|
||||||
|
*/
|
||||||
|
public void addAliasListConfigurations(List<AliasListConfiguration> configurations)
|
||||||
|
{
|
||||||
|
if(configurations != null)
|
||||||
|
{
|
||||||
|
for(AliasListConfiguration configuration: configurations)
|
||||||
|
{
|
||||||
|
String name = configuration.getName();
|
||||||
|
|
||||||
|
if(name != null && !name.isEmpty() && getAliasListConfiguration(name) == null)
|
||||||
|
{
|
||||||
|
mAliasListConfigurations.add(configuration);
|
||||||
|
addAliasList(name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration for the named alias list.
|
||||||
|
* @param aliasListName to find
|
||||||
|
* @return configuration or null if the alias list doesn't have one
|
||||||
|
*/
|
||||||
|
public AliasListConfiguration getAliasListConfiguration(String aliasListName)
|
||||||
|
{
|
||||||
|
if(aliasListName != null)
|
||||||
|
{
|
||||||
|
for(AliasListConfiguration configuration: mAliasListConfigurations)
|
||||||
|
{
|
||||||
|
if(aliasListName.equals(configuration.getName()))
|
||||||
|
{
|
||||||
|
return configuration;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Configuration for the named alias list, created when the alias list doesn't have one.
|
||||||
|
* @param aliasListName for the configuration, not null or the (No Alias List) name
|
||||||
|
* @return configuration
|
||||||
|
*/
|
||||||
|
public AliasListConfiguration getOrCreateAliasListConfiguration(String aliasListName)
|
||||||
|
{
|
||||||
|
if(aliasListName == null || aliasListName.isEmpty() || aliasListName.equals(NO_ALIAS_LIST))
|
||||||
|
{
|
||||||
|
throw new IllegalArgumentException("Invalid alias list name [" + aliasListName + "]");
|
||||||
|
}
|
||||||
|
|
||||||
|
AliasListConfiguration configuration = getAliasListConfiguration(aliasListName);
|
||||||
|
|
||||||
|
if(configuration == null)
|
||||||
|
{
|
||||||
|
configuration = new AliasListConfiguration(aliasListName);
|
||||||
|
mAliasListConfigurations.add(configuration);
|
||||||
|
addAliasList(aliasListName);
|
||||||
|
}
|
||||||
|
|
||||||
|
return configuration;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Name of the first alias list that tracks the Radio Reference system.
|
||||||
|
* @param systemId of the Radio Reference system
|
||||||
|
* @return alias list name or null
|
||||||
|
*/
|
||||||
|
public String getAliasListNameTracking(int systemId)
|
||||||
|
{
|
||||||
|
for(AliasListConfiguration configuration: mAliasListConfigurations)
|
||||||
|
{
|
||||||
|
if(configuration.isTracking(systemId))
|
||||||
|
{
|
||||||
|
return configuration.getName();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears and reloads the list of alias list names from the current set of aliases.
|
||||||
|
*/
|
||||||
|
public void refreshAliasListNames()
|
||||||
|
{
|
||||||
|
mAliasListNames.clear();
|
||||||
|
|
||||||
|
for(Alias alias : mAliases)
|
||||||
|
{
|
||||||
|
String aliasListName = alias.getAliasListName();
|
||||||
|
|
||||||
|
if(aliasListName != null && !aliasListName.isEmpty() && !mAliasListNames.contains(aliasListName))
|
||||||
|
{
|
||||||
|
mAliasListNames.add(aliasListName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Alias lists with a configuration exist even before they have any aliases
|
||||||
|
for(AliasListConfiguration configuration: mAliasListConfigurations)
|
||||||
|
{
|
||||||
|
if(!mAliasListNames.contains(configuration.getName()))
|
||||||
|
{
|
||||||
|
mAliasListNames.add(configuration.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Renames the alias list across the set of aliases.
|
||||||
|
* @param oldName currently used by the alias
|
||||||
|
* @param newName to apply to the alias
|
||||||
|
*/
|
||||||
|
public void renameAliasList(String oldName, String newName)
|
||||||
|
{
|
||||||
|
if(oldName == null || oldName.isEmpty() || newName == null || newName.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mAliases.stream().filter(alias -> oldName.equals(alias.getAliasListName())).forEach(alias -> alias.setAliasListName(newName));
|
||||||
|
|
||||||
|
AliasListConfiguration configuration = getAliasListConfiguration(oldName);
|
||||||
|
|
||||||
|
if(configuration != null)
|
||||||
|
{
|
||||||
|
//Merging into an existing list keeps that list's configuration
|
||||||
|
if(getAliasListConfiguration(newName) == null)
|
||||||
|
{
|
||||||
|
configuration.setName(newName);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
mAliasListConfigurations.remove(configuration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Deletes any aliases that have the alias list name
|
||||||
|
* @param aliasListName to delete
|
||||||
|
*/
|
||||||
|
public void deleteAliasList(String aliasListName)
|
||||||
|
{
|
||||||
|
if(aliasListName == null || aliasListName.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
mAliases.removeIf(alias -> alias.getAliasListName().equals(aliasListName));
|
||||||
|
mAliasListMap.remove(aliasListName);
|
||||||
|
mAliasListConfigurations.removeIf(configuration -> aliasListName.equals(configuration.getName()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds the list of alias list names to the currently managed set of alias list names.
|
||||||
|
* @param aliasListNames to add
|
||||||
|
*/
|
||||||
|
public void addAliasListNames(List<String> aliasListNames)
|
||||||
|
{
|
||||||
|
for(String aliasListName : aliasListNames)
|
||||||
|
{
|
||||||
|
if(!mAliasListNames.contains(aliasListName))
|
||||||
|
{
|
||||||
|
mAliasListNames.add(aliasListName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Unmodifiable list of all aliases currently in the model
|
* Unmodifiable list of all aliases currently in the model
|
||||||
*/
|
*/
|
||||||
@@ -83,6 +266,7 @@ public class AliasModel
|
|||||||
removeAlias(alias);
|
removeAlias(alias);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mAliasListConfigurations.clear();
|
||||||
mAliasListNames.clear();
|
mAliasListNames.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
571
src/main/java/io/github/dsheirer/alias/TalkerAliasAutoAdder.java
Normal file
571
src/main/java/io/github/dsheirer/alias/TalkerAliasAutoAdder.java
Normal file
@@ -0,0 +1,571 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias;
|
||||||
|
|
||||||
|
import com.google.common.annotations.VisibleForTesting;
|
||||||
|
import io.github.dsheirer.alias.id.AliasID;
|
||||||
|
import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
|
||||||
|
import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
|
||||||
|
import io.github.dsheirer.alias.id.radio.Radio;
|
||||||
|
import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
|
||||||
|
import io.github.dsheirer.identifier.radio.FullyQualifiedRadioIdentifier;
|
||||||
|
import io.github.dsheirer.identifier.radio.RadioIdentifier;
|
||||||
|
import io.github.dsheirer.module.decode.nxdn.identifier.NXDNRadioIdentifier;
|
||||||
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.function.BiConsumer;
|
||||||
|
import javafx.application.Platform;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Automatically adds decoded talker aliases to an alias list as radio aliases, using the talker alias as the alias name,
|
||||||
|
* and renames a stored radio alias when the radio's talker alias changes.
|
||||||
|
*
|
||||||
|
* Talker aliases span up to 4 messages, so a decoded talker alias can be a fragment (the leading characters) of the
|
||||||
|
* full alias, even when the decoder reports it as complete. To avoid replacing a full alias with a fragment:
|
||||||
|
* <ul>
|
||||||
|
* <li>A decoded alias that is the start of the stored alias name is a fragment and never replaces it.</li>
|
||||||
|
* <li>A decoded alias that starts with the stored alias name is a longer version of a stored fragment and
|
||||||
|
* replaces it.</li>
|
||||||
|
* <li>Any other decoded alias that differs from the stored alias name replaces it only after it is decoded
|
||||||
|
* {@link #CONFIRMATIONS_REQUIRED} times in a row for the radio.</li>
|
||||||
|
* </ul>
|
||||||
|
*
|
||||||
|
* Only aliases whose only identifier is the radio are created or renamed. An alias that combines the radio with other
|
||||||
|
* identifiers (e.g. several radios or talkgroups) is left alone. The exception is a P25 radio's simple and fully
|
||||||
|
* qualified radio identifiers with the same radio ID: the second form decoded is added to the alias for the first
|
||||||
|
* form, including a user alias outside the managed group, instead of creating a second alias for the same radio.
|
||||||
|
*
|
||||||
|
* This class is thread safe. Talker aliases are received on decoder threads and the alias model is updated on the
|
||||||
|
* JavaFX application thread.
|
||||||
|
*/
|
||||||
|
public class TalkerAliasAutoAdder implements BiConsumer<RadioIdentifier,TalkerAliasIdentifier>
|
||||||
|
{
|
||||||
|
private static final Logger mLog = LoggerFactory.getLogger(TalkerAliasAutoAdder.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Group assigned to aliases created from talker aliases.
|
||||||
|
*/
|
||||||
|
public static final String ALIAS_GROUP = "Talker Alias";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of consecutive times a different talker alias must be decoded for a radio before it replaces the stored
|
||||||
|
* alias name.
|
||||||
|
*/
|
||||||
|
public static final int CONFIRMATIONS_REQUIRED = 2;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interval for re-checking the stored alias for a talker alias that was already checked, so that a renamed or
|
||||||
|
* deleted alias is restored without checking the alias list for every decoded talker alias.
|
||||||
|
*/
|
||||||
|
private static final long RECHECK_INTERVAL_MS = 30_000;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Outcome of comparing a decoded talker alias with the stored alias name.
|
||||||
|
*/
|
||||||
|
public enum Decision
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The stored alias name matches the talker alias.
|
||||||
|
*/
|
||||||
|
UNCHANGED,
|
||||||
|
/**
|
||||||
|
* The talker alias is a fragment of the stored alias name.
|
||||||
|
*/
|
||||||
|
FRAGMENT,
|
||||||
|
/**
|
||||||
|
* The talker alias differs from the stored alias name and is waiting for more decodes.
|
||||||
|
*/
|
||||||
|
AWAIT_CONFIRMATION,
|
||||||
|
/**
|
||||||
|
* The talker alias replaces the stored alias name.
|
||||||
|
*/
|
||||||
|
UPDATE
|
||||||
|
}
|
||||||
|
|
||||||
|
private final AliasModel mAliasModel;
|
||||||
|
private final String mAliasListName;
|
||||||
|
//Guarded by this
|
||||||
|
private final Map<String,Candidate> mCandidates = new HashMap<>();
|
||||||
|
private final Map<String,Checked> mChecked = new HashMap<>();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param aliasModel to add aliases to
|
||||||
|
* @param aliasListName of the alias list to add aliases to
|
||||||
|
*/
|
||||||
|
public TalkerAliasAutoAdder(AliasModel aliasModel, String aliasListName)
|
||||||
|
{
|
||||||
|
mAliasModel = aliasModel;
|
||||||
|
mAliasListName = aliasListName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Name of the alias list that talker aliases are added to.
|
||||||
|
*/
|
||||||
|
public String getAliasListName()
|
||||||
|
{
|
||||||
|
return mAliasListName;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Processes a talker alias that is assigned to a radio.
|
||||||
|
* @param radio that the talker alias belongs to
|
||||||
|
* @param talkerAlias for the radio
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void accept(RadioIdentifier radio, TalkerAliasIdentifier talkerAlias)
|
||||||
|
{
|
||||||
|
if(radio == null || talkerAlias == null || mAliasListName == null || mAliasListName.isEmpty())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String value = normalize(talkerAlias.getValue());
|
||||||
|
Radio aliasId = createAliasId(radio);
|
||||||
|
|
||||||
|
if(value == null || aliasId == null || !aliasId.isValid())
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String key = getKey(aliasId);
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
int confirmations;
|
||||||
|
|
||||||
|
synchronized(this)
|
||||||
|
{
|
||||||
|
Checked checked = mChecked.get(key);
|
||||||
|
|
||||||
|
if(checked != null && checked.value().equals(value) && (now - checked.timestamp()) < RECHECK_INTERVAL_MS)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
confirmations = confirm(key, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
runOnFxThread(() -> apply(radio, aliasId, key, value, confirmations));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Counts the consecutive decodes of the talker alias for the radio. A fragment of the talker alias that is
|
||||||
|
* waiting for confirmation doesn't interrupt the count, because fragments are decoded while the full alias is
|
||||||
|
* assembled.
|
||||||
|
* @return number of consecutive decodes of the value, including this one.
|
||||||
|
*/
|
||||||
|
private int confirm(String key, String value)
|
||||||
|
{
|
||||||
|
Candidate candidate = mCandidates.get(key);
|
||||||
|
|
||||||
|
if(candidate != null && candidate.value().equals(value))
|
||||||
|
{
|
||||||
|
candidate = new Candidate(value, candidate.count() + 1);
|
||||||
|
mCandidates.put(key, candidate);
|
||||||
|
return candidate.count();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(candidate != null && isFragment(value, candidate.value()))
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
mCandidates.put(key, new Candidate(value, 1));
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates or updates the alias for the radio. Runs on the JavaFX application thread.
|
||||||
|
*/
|
||||||
|
private synchronized void apply(RadioIdentifier radio, Radio aliasId, String key, String value, int confirmations)
|
||||||
|
{
|
||||||
|
AliasList aliasList = mAliasModel.getAliasList(mAliasListName);
|
||||||
|
Alias existing = findExactMatch(aliasList.getAliases(radio), aliasId);
|
||||||
|
|
||||||
|
if(existing == null)
|
||||||
|
{
|
||||||
|
existing = findCompanion(aliasList.aliases(), radio, aliasId);
|
||||||
|
|
||||||
|
if(existing != null)
|
||||||
|
{
|
||||||
|
//Add the radio to the alias for the same radio's other identifier form, then continue below to
|
||||||
|
//compare the talker alias with the alias name (only managed aliases are renamed).
|
||||||
|
existing.addAliasID(aliasId);
|
||||||
|
aliasList.updateAlias(existing);
|
||||||
|
mLog.info("Talker alias radio [" + aliasId + "] added to existing alias [" + existing.getName() +
|
||||||
|
"] in alias list [" + mAliasListName + "]");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(existing == null)
|
||||||
|
{
|
||||||
|
Alias alias = new Alias(value);
|
||||||
|
alias.setAliasListName(mAliasListName);
|
||||||
|
alias.setGroup(ALIAS_GROUP);
|
||||||
|
alias.addAliasID(aliasId);
|
||||||
|
mAliasModel.addAlias(alias);
|
||||||
|
markChecked(key, value);
|
||||||
|
mLog.info("Talker alias [" + value + "] added for radio [" + aliasId + "] to alias list [" +
|
||||||
|
mAliasListName + "]");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!ALIAS_GROUP.equals(existing.getGroup()))
|
||||||
|
{
|
||||||
|
//Only maintain aliases in the managed group. Existing user aliases must not be renamed or duplicated.
|
||||||
|
markChecked(key, value);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(getIdentityCount(existing) > 1)
|
||||||
|
{
|
||||||
|
//The alias also identifies other radios or talkgroups - leave it alone.
|
||||||
|
markChecked(key, value);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
String stored = normalize(existing.getName());
|
||||||
|
|
||||||
|
switch(decide(stored, value, confirmations))
|
||||||
|
{
|
||||||
|
case UPDATE:
|
||||||
|
existing.setName(value);
|
||||||
|
markChecked(key, value);
|
||||||
|
mLog.info("Talker alias for radio [" + aliasId + "] in alias list [" + mAliasListName +
|
||||||
|
"] changed from [" + stored + "] to [" + value + "]");
|
||||||
|
break;
|
||||||
|
case UNCHANGED:
|
||||||
|
case FRAGMENT:
|
||||||
|
markChecked(key, value);
|
||||||
|
break;
|
||||||
|
case AWAIT_CONFIRMATION:
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void markChecked(String key, String value)
|
||||||
|
{
|
||||||
|
mChecked.put(key, new Checked(value, System.currentTimeMillis()));
|
||||||
|
mCandidates.remove(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compares the decoded talker alias with the stored alias name.
|
||||||
|
* @param stored alias name, normalized, or null
|
||||||
|
* @param decoded talker alias, normalized
|
||||||
|
* @param confirmations number of consecutive decodes of the talker alias
|
||||||
|
* @return decision
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
static Decision decide(String stored, String decoded, int confirmations)
|
||||||
|
{
|
||||||
|
if(stored == null || stored.isEmpty())
|
||||||
|
{
|
||||||
|
return Decision.UPDATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(stored.equals(decoded))
|
||||||
|
{
|
||||||
|
return Decision.UNCHANGED;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(isFragment(decoded, stored))
|
||||||
|
{
|
||||||
|
return Decision.FRAGMENT;
|
||||||
|
}
|
||||||
|
|
||||||
|
//A longer version of a stored fragment.
|
||||||
|
if(isFragment(stored, decoded) && !hasUndecodableCharacters(decoded))
|
||||||
|
{
|
||||||
|
return Decision.UPDATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
//A different alias that may be a corrupted or mis-assembled alias. It's replaced only once confirmed, and an
|
||||||
|
//alias that has undecodable characters (e.g. a partial multi-byte character) never replaces a stored alias.
|
||||||
|
if(confirmations >= CONFIRMATIONS_REQUIRED && !hasUndecodableCharacters(decoded))
|
||||||
|
{
|
||||||
|
return Decision.UPDATE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Decision.AWAIT_CONFIRMATION;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if the value is a fragment (the leading characters) of the full value.
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
static boolean isFragment(String value, String full)
|
||||||
|
{
|
||||||
|
return value != null && full != null && value.length() < full.length() && full.startsWith(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean hasUndecodableCharacters(String value)
|
||||||
|
{
|
||||||
|
return value.indexOf('<27>') >= 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Removes padding, control characters and trailing undecodable characters (e.g. from a partial multi-byte
|
||||||
|
* character at the end of an alias fragment) from the talker alias.
|
||||||
|
* @param value to normalize
|
||||||
|
* @return normalized value or null if the value is empty.
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
static String normalize(String value)
|
||||||
|
{
|
||||||
|
if(value == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
StringBuilder sb = new StringBuilder(value.length());
|
||||||
|
|
||||||
|
for(int i = 0; i < value.length(); i++)
|
||||||
|
{
|
||||||
|
char c = value.charAt(i);
|
||||||
|
|
||||||
|
if(!Character.isISOControl(c))
|
||||||
|
{
|
||||||
|
sb.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int end = sb.length();
|
||||||
|
|
||||||
|
while(end > 0 && (sb.charAt(end - 1) == '<27>' || Character.isWhitespace(sb.charAt(end - 1))))
|
||||||
|
{
|
||||||
|
end--;
|
||||||
|
}
|
||||||
|
|
||||||
|
String normalized = sb.substring(0, end).trim();
|
||||||
|
return normalized.isEmpty() ? null : normalized;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a radio alias identifier that exactly matches the radio.
|
||||||
|
* @param radio identifier
|
||||||
|
* @return alias identifier or null if the radio protocol isn't known.
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
static Radio createAliasId(RadioIdentifier radio)
|
||||||
|
{
|
||||||
|
if(radio instanceof FullyQualifiedRadioIdentifier fqri && fqri.getProtocol() == Protocol.APCO25)
|
||||||
|
{
|
||||||
|
return new P25FullyQualifiedRadio(fqri.getWacn(), fqri.getSystem(), fqri.getRadio());
|
||||||
|
}
|
||||||
|
|
||||||
|
if(radio instanceof NXDNRadioIdentifier nxdn && nxdn.isTypeD())
|
||||||
|
{
|
||||||
|
return new NXDNTypeDRadio(nxdn.getTypeDHomeRepeater(), nxdn.getTypeDRadio());
|
||||||
|
}
|
||||||
|
|
||||||
|
Protocol protocol = radio.getProtocol();
|
||||||
|
|
||||||
|
if(protocol == null || protocol == Protocol.UNKNOWN || radio.getValue() == null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return new Radio(protocol, radio.getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Finds the alias that has an identifier that exactly matches the radio (i.e. not a radio range).
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
static Alias findExactMatch(List<Alias> aliases, Radio aliasId)
|
||||||
|
{
|
||||||
|
if(aliases != null)
|
||||||
|
{
|
||||||
|
for(Alias alias: aliases)
|
||||||
|
{
|
||||||
|
for(AliasID id: alias.getAliasIdentifiers())
|
||||||
|
{
|
||||||
|
if(isExactMatch(id, aliasId))
|
||||||
|
{
|
||||||
|
return alias;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isExactMatch(AliasID id, Radio aliasId)
|
||||||
|
{
|
||||||
|
if(aliasId instanceof P25FullyQualifiedRadio target)
|
||||||
|
{
|
||||||
|
return id instanceof P25FullyQualifiedRadio fqr && fqr.getHashKey().equals(target.getHashKey());
|
||||||
|
}
|
||||||
|
|
||||||
|
return id instanceof Radio radio && !(id instanceof P25FullyQualifiedRadio) &&
|
||||||
|
radio.getProtocol() == aliasId.getProtocol() && radio.getValue() == aliasId.getValue();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Finds the alias for the other identifier form of a P25 radio, so that a radio's simple and fully qualified
|
||||||
|
* identifiers share one alias instead of creating an alias for each. This includes user aliases outside the
|
||||||
|
* managed group, so that either identifier maps to the user's alias. The user alias is never renamed.
|
||||||
|
* <ul>
|
||||||
|
* <li>Fully qualified radio: the alias whose only identifier is the simple radio with the same radio
|
||||||
|
* ID. Only when the fully qualified radio isn't using a different local address (e.g. a roaming radio), since
|
||||||
|
* the radio ID then belongs to the home system and doesn't identify the radio on this system.</li>
|
||||||
|
* <li>Simple radio: the alias whose only identifier is a fully qualified radio with the same radio ID. None
|
||||||
|
* when more than one fully qualified radio alias matches.</li>
|
||||||
|
* </ul>
|
||||||
|
* @param aliases to search
|
||||||
|
* @param radio decoded radio identifier
|
||||||
|
* @param aliasId created from the decoded radio
|
||||||
|
* @return companion alias or null.
|
||||||
|
*/
|
||||||
|
@VisibleForTesting
|
||||||
|
static Alias findCompanion(List<Alias> aliases, RadioIdentifier radio, Radio aliasId)
|
||||||
|
{
|
||||||
|
if(aliases == null || aliasId.getProtocol() != Protocol.APCO25)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
boolean fullyQualified = aliasId instanceof P25FullyQualifiedRadio;
|
||||||
|
|
||||||
|
if(fullyQualified && !(radio instanceof FullyQualifiedRadioIdentifier fqri &&
|
||||||
|
fqri.getValue() != null && fqri.getValue() == fqri.getRadio()))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Alias match = null;
|
||||||
|
|
||||||
|
for(Alias alias: aliases)
|
||||||
|
{
|
||||||
|
if(getSoleIdentity(alias) instanceof Radio candidate &&
|
||||||
|
(candidate instanceof P25FullyQualifiedRadio) != fullyQualified &&
|
||||||
|
candidate.getProtocol() == Protocol.APCO25 && candidate.getValue() == aliasId.getValue())
|
||||||
|
{
|
||||||
|
if(match != null)
|
||||||
|
{
|
||||||
|
//Ambiguous - more than one candidate.
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
match = alias;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return match;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Identifier of an alias that has exactly one identifier, excluding audio settings.
|
||||||
|
* @return identifier or null if the alias has none or more than one.
|
||||||
|
*/
|
||||||
|
private static AliasID getSoleIdentity(Alias alias)
|
||||||
|
{
|
||||||
|
AliasID sole = null;
|
||||||
|
|
||||||
|
for(AliasID id: alias.getAliasIdentifiers())
|
||||||
|
{
|
||||||
|
if(!id.isAudioIdentifier())
|
||||||
|
{
|
||||||
|
if(sole != null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
sole = id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sole;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of identities (e.g. radios, talkgroups) in the alias, excluding audio settings like priority, record and
|
||||||
|
* streaming. A P25 radio's simple and fully qualified radio identifiers with the same radio ID count as one
|
||||||
|
* identity.
|
||||||
|
*/
|
||||||
|
private static int getIdentityCount(Alias alias)
|
||||||
|
{
|
||||||
|
List<AliasID> ids = alias.getAliasIdentifiers().stream().filter(id -> !id.isAudioIdentifier()).toList();
|
||||||
|
|
||||||
|
if(ids.size() == 2 && isRadioPair(ids.get(0), ids.get(1)))
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ids.size();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Indicates if the identifiers are the simple and fully qualified forms of the same P25 radio ID.
|
||||||
|
*/
|
||||||
|
private static boolean isRadioPair(AliasID a, AliasID b)
|
||||||
|
{
|
||||||
|
if(a instanceof P25FullyQualifiedRadio)
|
||||||
|
{
|
||||||
|
AliasID swap = a;
|
||||||
|
a = b;
|
||||||
|
b = swap;
|
||||||
|
}
|
||||||
|
|
||||||
|
return a instanceof Radio simple && !(a instanceof P25FullyQualifiedRadio) &&
|
||||||
|
b instanceof P25FullyQualifiedRadio fqr && simple.getProtocol() == Protocol.APCO25 &&
|
||||||
|
simple.getValue() == fqr.getValue();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String getKey(Radio aliasId)
|
||||||
|
{
|
||||||
|
if(aliasId instanceof P25FullyQualifiedRadio fqr)
|
||||||
|
{
|
||||||
|
return aliasId.getProtocol() + ":" + fqr.getHashKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
return aliasId.getProtocol() + ":" + aliasId.getValue();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Runs on the FX thread, or on this thread when the FX toolkit isn't running (headless).
|
||||||
|
*/
|
||||||
|
private static void runOnFxThread(Runnable runnable)
|
||||||
|
{
|
||||||
|
if(Platform.isFxApplicationThread())
|
||||||
|
{
|
||||||
|
runnable.run();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Platform.runLater(runnable);
|
||||||
|
}
|
||||||
|
catch(IllegalStateException ise)
|
||||||
|
{
|
||||||
|
runnable.run();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private record Candidate(String value, int count) {}
|
||||||
|
private record Checked(String value, long timestamp) {}
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2025 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
|
||||||
@@ -35,13 +35,18 @@ import io.github.dsheirer.alias.id.legacy.talkgroup.LegacyTalkgroupID;
|
|||||||
import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
|
import io.github.dsheirer.alias.id.legacy.uniqueID.UniqueID;
|
||||||
import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
|
import io.github.dsheirer.alias.id.lojack.LoJackFunctionAndID;
|
||||||
import io.github.dsheirer.alias.id.priority.Priority;
|
import io.github.dsheirer.alias.id.priority.Priority;
|
||||||
|
import io.github.dsheirer.alias.id.radio.NXDNTypeDRadio;
|
||||||
|
import io.github.dsheirer.alias.id.radio.NXDNTypeDRadioRange;
|
||||||
import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
|
import io.github.dsheirer.alias.id.radio.P25FullyQualifiedRadio;
|
||||||
import io.github.dsheirer.alias.id.radio.Radio;
|
import io.github.dsheirer.alias.id.radio.Radio;
|
||||||
import io.github.dsheirer.alias.id.radio.RadioRange;
|
import io.github.dsheirer.alias.id.radio.RadioRange;
|
||||||
import io.github.dsheirer.alias.id.record.Record;
|
import io.github.dsheirer.alias.id.record.Record;
|
||||||
import io.github.dsheirer.alias.id.status.UnitStatusID;
|
import io.github.dsheirer.alias.id.status.UnitStatusID;
|
||||||
import io.github.dsheirer.alias.id.status.UserStatusID;
|
import io.github.dsheirer.alias.id.status.UserStatusID;
|
||||||
|
import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroup;
|
||||||
|
import io.github.dsheirer.alias.id.talkgroup.NXDNTypeDTalkgroupRange;
|
||||||
import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
|
import io.github.dsheirer.alias.id.talkgroup.P25FullyQualifiedTalkgroup;
|
||||||
|
import io.github.dsheirer.alias.id.talkgroup.StreamAsTalkgroup;
|
||||||
import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
|
import io.github.dsheirer.alias.id.talkgroup.Talkgroup;
|
||||||
import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
|
import io.github.dsheirer.alias.id.talkgroup.TalkgroupRange;
|
||||||
import io.github.dsheirer.alias.id.tone.TonesID;
|
import io.github.dsheirer.alias.id.tone.TonesID;
|
||||||
@@ -63,6 +68,10 @@ import javafx.util.Callback;
|
|||||||
@JsonSubTypes.Type(value = Min.class, name = "min"),
|
@JsonSubTypes.Type(value = Min.class, name = "min"),
|
||||||
@JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
|
@JsonSubTypes.Type(value = MPT1327ID.class, name = "mpt1327ID"),
|
||||||
@JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
|
@JsonSubTypes.Type(value = NonRecordable.class, name = "nonRecordable"),
|
||||||
|
@JsonSubTypes.Type(value = NXDNTypeDRadio.class, name = "nxdnTypeDRadio"),
|
||||||
|
@JsonSubTypes.Type(value = NXDNTypeDRadioRange.class, name = "nxdnTypeDRadioRange"),
|
||||||
|
@JsonSubTypes.Type(value = NXDNTypeDTalkgroup.class, name = "nxdnTypeDTalkgroup"),
|
||||||
|
@JsonSubTypes.Type(value = NXDNTypeDTalkgroupRange.class, name = "nxdnTypeDTalkgroupRange"),
|
||||||
@JsonSubTypes.Type(value = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
|
@JsonSubTypes.Type(value = P25FullyQualifiedRadio.class, name = "p25FullyQualifiedRadio"),
|
||||||
@JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
|
@JsonSubTypes.Type(value = P25FullyQualifiedTalkgroup.class, name = "p25FullyQualifiedTalkgroup"),
|
||||||
@JsonSubTypes.Type(value = Priority.class, name = "priority"),
|
@JsonSubTypes.Type(value = Priority.class, name = "priority"),
|
||||||
@@ -70,6 +79,7 @@ import javafx.util.Callback;
|
|||||||
@JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),
|
@JsonSubTypes.Type(value = RadioRange.class, name = "radioRange"),
|
||||||
@JsonSubTypes.Type(value = Record.class, name = "record"),
|
@JsonSubTypes.Type(value = Record.class, name = "record"),
|
||||||
@JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
|
@JsonSubTypes.Type(value = SiteID.class, name = "siteID"),
|
||||||
|
@JsonSubTypes.Type(value = StreamAsTalkgroup.class, name = "streamAsTalkgroup"),
|
||||||
@JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
|
@JsonSubTypes.Type(value = Talkgroup.class, name = "talkgroup"),
|
||||||
@JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
|
@JsonSubTypes.Type(value = TalkgroupRange.class, name = "talkgroupRange"),
|
||||||
@JsonSubTypes.Type(value = TonesID.class, name = "tones"),
|
@JsonSubTypes.Type(value = TonesID.class, name = "tones"),
|
||||||
|
|||||||
@@ -29,6 +29,10 @@ public enum AliasIDType
|
|||||||
LOJACK("LoJack"),
|
LOJACK("LoJack"),
|
||||||
LTR_NET_UID("LTR-Net UID"),
|
LTR_NET_UID("LTR-Net UID"),
|
||||||
MIN("Passport MIN"),
|
MIN("Passport MIN"),
|
||||||
|
NXDN_TYPE_D_RADIO_ID("NXDN Type-D Radio ID"),
|
||||||
|
NXDN_TYPE_D_RADIO_ID_RANGE("NXDN Type-D Radio ID Range"),
|
||||||
|
NXDN_TYPE_D_TALKGROUP("NXDN Type-D Talkgroup"),
|
||||||
|
NXDN_TYPE_D_TALKGROUP_RANGE("NXDN Type-D Talkgroup Range"),
|
||||||
P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
|
P25_FULLY_QUALIFIED_RADIO_ID("P25 Fully Qualified Radio ID"),
|
||||||
P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
|
P25_FULLY_QUALIFIED_TALKGROUP("P25 Fully Qualified Talkgroup"),
|
||||||
PRIORITY("Audio Priority"),
|
PRIORITY("Audio Priority"),
|
||||||
@@ -58,6 +62,7 @@ public enum AliasIDType
|
|||||||
|
|
||||||
//Values used by the View-By alias editor
|
//Values used by the View-By alias editor
|
||||||
public static EnumSet<AliasIDType> VIEW_BY_VALUES = EnumSet.of(TALKGROUP, TALKGROUP_RANGE, RADIO_ID, RADIO_ID_RANGE,
|
public static EnumSet<AliasIDType> VIEW_BY_VALUES = EnumSet.of(TALKGROUP, TALKGROUP_RANGE, RADIO_ID, RADIO_ID_RANGE,
|
||||||
|
NXDN_TYPE_D_RADIO_ID, NXDN_TYPE_D_RADIO_ID_RANGE, NXDN_TYPE_D_TALKGROUP, NXDN_TYPE_D_TALKGROUP_RANGE,
|
||||||
P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);
|
P25_FULLY_QUALIFIED_RADIO_ID, P25_FULLY_QUALIFIED_TALKGROUP, UNIT_STATUS, STATUS, TONES);
|
||||||
|
|
||||||
public String toString()
|
public String toString()
|
||||||
|
|||||||
46
src/main/java/io/github/dsheirer/alias/id/INXDNTypeD.java
Normal file
46
src/main/java/io/github/dsheirer/alias/id/INXDNTypeD.java
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias.id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NXDN Type-D alias identifier composed of a home repeater and a radio or talkgroup identifier value.
|
||||||
|
*/
|
||||||
|
public interface INXDNTypeD
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Home repeater for the identifier
|
||||||
|
*/
|
||||||
|
int getHomeRepeater();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the home repeater for the identifier
|
||||||
|
*/
|
||||||
|
void setHomeRepeater(int homeRepeater);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Radio or talkgroup value, without the home repeater.
|
||||||
|
*/
|
||||||
|
int getIdentifier();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the radio or talkgroup value, without the home repeater.
|
||||||
|
*/
|
||||||
|
void setIdentifier(int identifier);
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias.id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NXDN Type-D alias identifier range of radio or talkgroup values that share a common home repeater.
|
||||||
|
*/
|
||||||
|
public interface INXDNTypeDRange
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Home repeater for the range
|
||||||
|
*/
|
||||||
|
int getHomeRepeater();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the home repeater for the range
|
||||||
|
*/
|
||||||
|
void setHomeRepeater(int homeRepeater);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Minimum radio or talkgroup value, without the home repeater.
|
||||||
|
*/
|
||||||
|
int getMinIdentifier();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the minimum radio or talkgroup value, without the home repeater.
|
||||||
|
*/
|
||||||
|
void setMinIdentifier(int identifier);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Maximum radio or talkgroup value, without the home repeater.
|
||||||
|
*/
|
||||||
|
int getMaxIdentifier();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the maximum radio or talkgroup value, without the home repeater.
|
||||||
|
*/
|
||||||
|
void setMaxIdentifier(int identifier);
|
||||||
|
}
|
||||||
@@ -22,7 +22,7 @@ package io.github.dsheirer.alias.id.dcs;
|
|||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
import io.github.dsheirer.alias.id.AliasID;
|
import io.github.dsheirer.alias.id.AliasID;
|
||||||
import io.github.dsheirer.alias.id.AliasIDType;
|
import io.github.dsheirer.alias.id.AliasIDType;
|
||||||
import io.github.dsheirer.module.decode.dcs.DCSCode;
|
import io.github.dsheirer.module.decode.squelch.dcs.DCSCode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Digital Coded Squelch (DCS) tone identifier
|
* Digital Coded Squelch (DCS) tone identifier
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias.id.radio;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import io.github.dsheirer.alias.id.AliasIDType;
|
||||||
|
import io.github.dsheirer.alias.id.INXDNTypeD;
|
||||||
|
import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
|
||||||
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NXDN Type-D radio. The value is the over-the-air 16-bit identifier that combines the home repeater and radio so that
|
||||||
|
* it matches the value of an NXDN Type-D radio identifier.
|
||||||
|
*/
|
||||||
|
public class NXDNTypeDRadio extends Radio implements INXDNTypeD
|
||||||
|
{
|
||||||
|
public NXDNTypeDRadio()
|
||||||
|
{
|
||||||
|
//No-arg JAXB constructor
|
||||||
|
setProtocol(Protocol.NXDN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param homeRepeater for the radio
|
||||||
|
* @param radio value, without the home repeater
|
||||||
|
*/
|
||||||
|
public NXDNTypeDRadio(int homeRepeater, int radio)
|
||||||
|
{
|
||||||
|
super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, radio));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AliasIDType getType()
|
||||||
|
{
|
||||||
|
return AliasIDType.NXDN_TYPE_D_RADIO_ID;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getHomeRepeater()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setHomeRepeater(int homeRepeater)
|
||||||
|
{
|
||||||
|
setValue(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, getIdentifier()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getIdentifier()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDIdentifier(getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setIdentifier(int identifier)
|
||||||
|
{
|
||||||
|
setValue(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append("Type-D Radio ID:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getIdentifier(), true));
|
||||||
|
sb.append(" Protocol:").append(getProtocol());
|
||||||
|
|
||||||
|
if(!isValid())
|
||||||
|
{
|
||||||
|
sb.append(" **NOT VALID**");
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias.id.radio;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import io.github.dsheirer.alias.id.AliasIDType;
|
||||||
|
import io.github.dsheirer.alias.id.INXDNTypeDRange;
|
||||||
|
import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
|
||||||
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NXDN Type-D radio range for a single home repeater. The min and max values are the over-the-air 16-bit identifiers
|
||||||
|
* that combine the home repeater and radio.
|
||||||
|
*/
|
||||||
|
public class NXDNTypeDRadioRange extends RadioRange implements INXDNTypeDRange
|
||||||
|
{
|
||||||
|
public NXDNTypeDRadioRange()
|
||||||
|
{
|
||||||
|
//No-arg JAXB constructor
|
||||||
|
setProtocol(Protocol.NXDN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param homeRepeater for the range
|
||||||
|
* @param minRadio value, without the home repeater
|
||||||
|
* @param maxRadio value, without the home repeater
|
||||||
|
*/
|
||||||
|
public NXDNTypeDRadioRange(int homeRepeater, int minRadio, int maxRadio)
|
||||||
|
{
|
||||||
|
super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, minRadio),
|
||||||
|
NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, maxRadio));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AliasIDType getType()
|
||||||
|
{
|
||||||
|
return AliasIDType.NXDN_TYPE_D_RADIO_ID_RANGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getHomeRepeater()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMinRadio());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setHomeRepeater(int homeRepeater)
|
||||||
|
{
|
||||||
|
int min = getMinIdentifier();
|
||||||
|
int max = getMaxIdentifier();
|
||||||
|
setMinRadio(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, min));
|
||||||
|
setMaxRadio(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, max));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getMinIdentifier()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDIdentifier(getMinRadio());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setMinIdentifier(int identifier)
|
||||||
|
{
|
||||||
|
setMinRadio(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getMaxIdentifier()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDIdentifier(getMaxRadio());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setMaxIdentifier(int identifier)
|
||||||
|
{
|
||||||
|
setMaxRadio(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Valid when the base range is valid and both ends of the range use the same home repeater.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
return super.isValid() && getHomeRepeater() == NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMaxRadio());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append("Type-D Radio ID Range:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMinIdentifier(), true));
|
||||||
|
sb.append(" to ").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMaxIdentifier(), true));
|
||||||
|
sb.append(" Protocol:").append(getProtocol());
|
||||||
|
|
||||||
|
if(!isValid())
|
||||||
|
{
|
||||||
|
sb.append(" **NOT VALID**");
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 io.github.dsheirer.alias.id.radio;
|
package io.github.dsheirer.alias.id.radio;
|
||||||
@@ -38,10 +35,11 @@ public enum RadioFormat
|
|||||||
"<html>APCO25 valid range is 0 to 16,777,215"),
|
"<html>APCO25 valid range is 0 to 16,777,215"),
|
||||||
DMR("********", 0, 0xFFFFFF, "0 to 16,777,215",
|
DMR("********", 0, 0xFFFFFF, "0 to 16,777,215",
|
||||||
"<html>DMR unit id valid range is 0 to 16,777,215"),
|
"<html>DMR unit id valid range is 0 to 16,777,215"),
|
||||||
|
NXDN("*****", 1, 0xFFFF, "1 to 65,535", "NXDN valid range is 1 to 65,535"),
|
||||||
PASSPORT("********", 0, 0x7FFFFF, "0 to 8,388,607",
|
PASSPORT("********", 0, 0x7FFFFF, "0 to 8,388,607",
|
||||||
"<html>PASSPORT valid range is 0 to 8,388,607"),
|
"<html>PASSPORT valid range is 0 to 8,388,607"),
|
||||||
UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
|
UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
|
||||||
"Unknown protocol valid value range is 1-16,777,215");
|
"<html>Unknown protocol valid value range is 1-16,777,215");
|
||||||
|
|
||||||
private String mMask;
|
private String mMask;
|
||||||
private int mMinimumValue;
|
private int mMinimumValue;
|
||||||
@@ -116,6 +114,8 @@ public enum RadioFormat
|
|||||||
return APCO25;
|
return APCO25;
|
||||||
case DMR:
|
case DMR:
|
||||||
return DMR;
|
return DMR;
|
||||||
|
case NXDN:
|
||||||
|
return NXDN;
|
||||||
case PASSPORT:
|
case PASSPORT:
|
||||||
return PASSPORT;
|
return PASSPORT;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2019 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 io.github.dsheirer.alias.id.radio;
|
package io.github.dsheirer.alias.id.radio;
|
||||||
@@ -26,14 +23,14 @@ import io.github.dsheirer.preference.identifier.IntegerFormat;
|
|||||||
import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.APCO25TalkgroupFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.AbstractIntegerFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.AbstractIntegerFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.DMRTalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.DMRTalkgroupFormatter;
|
||||||
|
import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Protocol-specific formatting of radio id values and parsing of formatted radio id values.
|
* Protocol-specific formatting of radio id values and parsing of formatted radio id values.
|
||||||
@@ -47,6 +44,7 @@ public class RadioFormatter
|
|||||||
{
|
{
|
||||||
mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
|
mFormatterMap.put(Protocol.APCO25, new APCO25TalkgroupFormatter());
|
||||||
mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
|
mFormatterMap.put(Protocol.DMR, new DMRTalkgroupFormatter());
|
||||||
|
mFormatterMap.put(Protocol.NXDN, new NXDNTalkgroupFormatter());
|
||||||
mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
|
mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,96 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias.id.talkgroup;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import io.github.dsheirer.alias.id.AliasIDType;
|
||||||
|
import io.github.dsheirer.alias.id.INXDNTypeD;
|
||||||
|
import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
|
||||||
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NXDN Type-D talkgroup. The value is the over-the-air 16-bit identifier that combines the home repeater and talkgroup
|
||||||
|
* so that it matches the value of an NXDN Type-D talkgroup identifier.
|
||||||
|
*/
|
||||||
|
public class NXDNTypeDTalkgroup extends Talkgroup implements INXDNTypeD
|
||||||
|
{
|
||||||
|
public NXDNTypeDTalkgroup()
|
||||||
|
{
|
||||||
|
//No-arg JAXB constructor
|
||||||
|
setProtocol(Protocol.NXDN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param homeRepeater for the talkgroup
|
||||||
|
* @param talkgroup value, without the home repeater
|
||||||
|
*/
|
||||||
|
public NXDNTypeDTalkgroup(int homeRepeater, int talkgroup)
|
||||||
|
{
|
||||||
|
super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, talkgroup));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AliasIDType getType()
|
||||||
|
{
|
||||||
|
return AliasIDType.NXDN_TYPE_D_TALKGROUP;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getHomeRepeater()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setHomeRepeater(int homeRepeater)
|
||||||
|
{
|
||||||
|
setValue(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, getIdentifier()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getIdentifier()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDIdentifier(getValue());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setIdentifier(int identifier)
|
||||||
|
{
|
||||||
|
setValue(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append("Type-D Talkgroup:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getIdentifier(), true));
|
||||||
|
sb.append(" Protocol:").append(getProtocol());
|
||||||
|
|
||||||
|
if(!isValid())
|
||||||
|
{
|
||||||
|
sb.append(" **NOT VALID**");
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,125 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.alias.id.talkgroup;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import io.github.dsheirer.alias.id.AliasIDType;
|
||||||
|
import io.github.dsheirer.alias.id.INXDNTypeDRange;
|
||||||
|
import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
|
||||||
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* NXDN Type-D talkgroup range for a single home repeater. The min and max values are the over-the-air 16-bit
|
||||||
|
* identifiers that combine the home repeater and talkgroup.
|
||||||
|
*/
|
||||||
|
public class NXDNTypeDTalkgroupRange extends TalkgroupRange implements INXDNTypeDRange
|
||||||
|
{
|
||||||
|
public NXDNTypeDTalkgroupRange()
|
||||||
|
{
|
||||||
|
//No-arg JAXB constructor
|
||||||
|
setProtocol(Protocol.NXDN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Constructs an instance
|
||||||
|
* @param homeRepeater for the range
|
||||||
|
* @param minTalkgroup value, without the home repeater
|
||||||
|
* @param maxTalkgroup value, without the home repeater
|
||||||
|
*/
|
||||||
|
public NXDNTypeDTalkgroupRange(int homeRepeater, int minTalkgroup, int maxTalkgroup)
|
||||||
|
{
|
||||||
|
super(Protocol.NXDN, NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, minTalkgroup),
|
||||||
|
NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, maxTalkgroup));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AliasIDType getType()
|
||||||
|
{
|
||||||
|
return AliasIDType.NXDN_TYPE_D_TALKGROUP_RANGE;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getHomeRepeater()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMinTalkgroup());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setHomeRepeater(int homeRepeater)
|
||||||
|
{
|
||||||
|
int min = getMinIdentifier();
|
||||||
|
int max = getMaxIdentifier();
|
||||||
|
setMinTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, min));
|
||||||
|
setMaxTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(homeRepeater, max));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getMinIdentifier()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDIdentifier(getMinTalkgroup());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setMinIdentifier(int identifier)
|
||||||
|
{
|
||||||
|
setMinTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public int getMaxIdentifier()
|
||||||
|
{
|
||||||
|
return NXDNTalkgroupFormatter.getTypeDIdentifier(getMaxTalkgroup());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setMaxIdentifier(int identifier)
|
||||||
|
{
|
||||||
|
setMaxTalkgroup(NXDNTalkgroupFormatter.toTypeDValue(getHomeRepeater(), identifier));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Valid when the base range is valid and both ends of the range use the same home repeater.
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public boolean isValid()
|
||||||
|
{
|
||||||
|
return super.isValid() &&
|
||||||
|
getHomeRepeater() == NXDNTalkgroupFormatter.getTypeDHomeRepeater(getMaxTalkgroup());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString()
|
||||||
|
{
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
sb.append("Type-D Talkgroup Range:").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMinIdentifier(), true));
|
||||||
|
sb.append(" to ").append(NXDNTalkgroupFormatter.toTypeD(getHomeRepeater(), getMaxIdentifier(), true));
|
||||||
|
sb.append(" Protocol:").append(getProtocol());
|
||||||
|
|
||||||
|
if(!isValid())
|
||||||
|
{
|
||||||
|
sb.append(" **NOT VALID**");
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2025 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 io.github.dsheirer.alias.id.talkgroup;
|
||||||
|
|
||||||
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Streaming talkgroup alias. For streamed audio metadata, this value is used to replace the decoded talkgroup or TO
|
||||||
|
* value with an alias value when there are talkgroup collisions resulting from streaming multiple channels to the
|
||||||
|
* same stream. This is common in P25 conventional repeater setups where each radio channel is using talkgroup 1.
|
||||||
|
*/
|
||||||
|
public class StreamAsTalkgroup extends Talkgroup
|
||||||
|
{
|
||||||
|
public StreamAsTalkgroup(int talkgroup)
|
||||||
|
{
|
||||||
|
super(Protocol.UNKNOWN, talkgroup);
|
||||||
|
}
|
||||||
|
|
||||||
|
public StreamAsTalkgroup()
|
||||||
|
{
|
||||||
|
//No arg JAXB constructor
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 io.github.dsheirer.alias.id.talkgroup;
|
package io.github.dsheirer.alias.id.talkgroup;
|
||||||
@@ -50,6 +47,8 @@ public enum TalkgroupFormat
|
|||||||
"<html>MPT-1327 valid ranges are 0-127(prefix)<br>and 1-8192(ident) (ie. 000-0001 to 127-8192)"),
|
"<html>MPT-1327 valid ranges are 0-127(prefix)<br>and 1-8192(ident) (ie. 000-0001 to 127-8192)"),
|
||||||
NBFM("*****", 1, 0xFFFF, "1 to 65,535",
|
NBFM("*****", 1, 0xFFFF, "1 to 65,535",
|
||||||
"NBFM valid value range is 1-65,535"),
|
"NBFM valid value range is 1-65,535"),
|
||||||
|
NXDN("*****", 0, 0xFFFF, "0 to 65,535",
|
||||||
|
"NXDN talkgroup valid range is 0 to 65,535"),
|
||||||
PASSPORT("*****", 1, 0xFFFF, "1 to 65,535",
|
PASSPORT("*****", 1, 0xFFFF, "1 to 65,535",
|
||||||
"Passport valid value range is 1-65,535"),
|
"Passport valid value range is 1-65,535"),
|
||||||
UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
|
UNKNOWN("********", 1, 0xFFFFFF, "1 to 16,777,215",
|
||||||
@@ -139,6 +138,8 @@ public enum TalkgroupFormat
|
|||||||
return MPT1327;
|
return MPT1327;
|
||||||
case NBFM:
|
case NBFM:
|
||||||
return NBFM;
|
return NBFM;
|
||||||
|
case NXDN:
|
||||||
|
return NXDN;
|
||||||
case PASSPORT:
|
case PASSPORT:
|
||||||
return PASSPORT;
|
return PASSPORT;
|
||||||
default:
|
default:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2026 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
|
||||||
@@ -28,6 +28,7 @@ import io.github.dsheirer.preference.identifier.talkgroup.FleetsyncTalkgroupForm
|
|||||||
import io.github.dsheirer.preference.identifier.talkgroup.LTRTalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.LTRTalkgroupFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.MDC1200TalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.MDC1200TalkgroupFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.MPT1327TalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.MPT1327TalkgroupFormatter;
|
||||||
|
import io.github.dsheirer.preference.identifier.talkgroup.NXDNTalkgroupFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.PassportTalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.PassportTalkgroupFormatter;
|
||||||
import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
|
import io.github.dsheirer.preference.identifier.talkgroup.UnknownTalkgroupFormatter;
|
||||||
import io.github.dsheirer.protocol.Protocol;
|
import io.github.dsheirer.protocol.Protocol;
|
||||||
@@ -59,6 +60,7 @@ public class TalkgroupFormatter
|
|||||||
mFormatterMap.put(Protocol.LTR_NET, ltr);
|
mFormatterMap.put(Protocol.LTR_NET, ltr);
|
||||||
mFormatterMap.put(Protocol.MDC1200, new MDC1200TalkgroupFormatter());
|
mFormatterMap.put(Protocol.MDC1200, new MDC1200TalkgroupFormatter());
|
||||||
mFormatterMap.put(Protocol.MPT1327, new MPT1327TalkgroupFormatter());
|
mFormatterMap.put(Protocol.MPT1327, new MPT1327TalkgroupFormatter());
|
||||||
|
mFormatterMap.put(Protocol.NXDN, new NXDNTalkgroupFormatter());
|
||||||
mFormatterMap.put(Protocol.PASSPORT, new PassportTalkgroupFormatter());
|
mFormatterMap.put(Protocol.PASSPORT, new PassportTalkgroupFormatter());
|
||||||
mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
|
mFormatterMap.put(Protocol.UNKNOWN, new UnknownTalkgroupFormatter());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,17 @@
|
|||||||
|
package io.github.dsheirer.audio;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used for defining an array list of filter methods to be implemented in AudioModule
|
||||||
|
* The filters will be applied in the order given in the list.
|
||||||
|
* Each audio filter mush implement the filter method.
|
||||||
|
*/
|
||||||
|
|
||||||
|
public abstract class AbstractAudioFilter
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* To be overridden by each audio filter
|
||||||
|
* @param audio a buffer of 8 KHz audio samples
|
||||||
|
* @return float[] filtered buffer of 8 KHz audio samples
|
||||||
|
*/
|
||||||
|
public abstract float[] filter(float[] audio);
|
||||||
|
}
|
||||||
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
public abstract class AbstractAudioModule extends Module implements IAudioSegmentProvider, IdentifierUpdateListener
|
public abstract class AbstractAudioModule extends Module implements IAudioSegmentProvider, IdentifierUpdateListener
|
||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(AbstractAudioModule.class);
|
private final static Logger mLog = LoggerFactory.getLogger(AbstractAudioModule.class);
|
||||||
public static final long DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH = 60 * 8000; // 1 minute @ 8kHz
|
public static final long DEFAULT_MAX_SEGMENT_LENGTH_MILLIS = 60_000; // 1 minute
|
||||||
public static final int DEFAULT_TIMESLOT = 0;
|
public static final int DEFAULT_TIMESLOT = 0;
|
||||||
private final int mMaxSegmentAudioSampleLength;
|
private final int mMaxSegmentAudioSampleLength;
|
||||||
private Listener<AudioSegment> mAudioSegmentListener;
|
private Listener<AudioSegment> mAudioSegmentListener;
|
||||||
@@ -51,12 +51,12 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen
|
|||||||
* Constructs an abstract audio module
|
* Constructs an abstract audio module
|
||||||
*
|
*
|
||||||
* @param aliasList for aliasing identifiers
|
* @param aliasList for aliasing identifiers
|
||||||
* @param maxSegmentAudioSampleLength in milliseconds
|
* @param maxSegmentLengthMillis maximum audio segment length in milliseconds
|
||||||
*/
|
*/
|
||||||
public AbstractAudioModule(AliasList aliasList, int timeslot, long maxSegmentAudioSampleLength)
|
public AbstractAudioModule(AliasList aliasList, int timeslot, long maxSegmentLengthMillis)
|
||||||
{
|
{
|
||||||
mAliasList = aliasList;
|
mAliasList = aliasList;
|
||||||
mMaxSegmentAudioSampleLength = (int)(maxSegmentAudioSampleLength * 8); //Convert milliseconds to samples
|
mMaxSegmentAudioSampleLength = (int)(maxSegmentLengthMillis * 8); //Convert milliseconds to samples
|
||||||
mTimeslot = timeslot;
|
mTimeslot = timeslot;
|
||||||
mIdentifierCollection = new MutableIdentifierCollection(getTimeslot());
|
mIdentifierCollection = new MutableIdentifierCollection(getTimeslot());
|
||||||
mIdentifierUpdateNotificationBroadcaster.addListener(mIdentifierCollection);
|
mIdentifierUpdateNotificationBroadcaster.addListener(mIdentifierCollection);
|
||||||
@@ -67,7 +67,7 @@ public abstract class AbstractAudioModule extends Module implements IAudioSegmen
|
|||||||
*/
|
*/
|
||||||
public AbstractAudioModule(AliasList aliasList)
|
public AbstractAudioModule(AliasList aliasList)
|
||||||
{
|
{
|
||||||
this(aliasList, DEFAULT_TIMESLOT, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
|
this(aliasList, DEFAULT_TIMESLOT, DEFAULT_MAX_SEGMENT_LENGTH_MILLIS);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2024 Dennis Sheirer
|
* Copyright (C) 2014-2026 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
|
||||||
@@ -17,31 +17,28 @@
|
|||||||
* ****************************************************************************
|
* ****************************************************************************
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.github.dsheirer.source.tuner.sdrplay.api.parameter.event;
|
package io.github.dsheirer.audio;
|
||||||
|
|
||||||
import io.github.dsheirer.source.tuner.sdrplay.api.v3_07.sdrplay_api_RspDuoModeCbParamT;
|
import io.github.dsheirer.dsp.gain.AudioGainAndDcFilter;
|
||||||
import java.lang.foreign.MemorySegment;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* RSP-Duo Mode Callback Parameters (sdrplay_api_RspDuoModeCbParamT)
|
* This is a wrapper for the AudioGainAndDcFilter class so it can be used with the AudioModule filter list.
|
||||||
|
* Usually instantiated in the DecoderFactory
|
||||||
*/
|
*/
|
||||||
public class RspDuoModeCallbackParameters
|
public class AudioGainFilter extends AbstractAudioFilter
|
||||||
{
|
{
|
||||||
private final RspDuoModeEventType mRspDuoModeEventType;
|
AudioGainAndDcFilter mAudioGain;
|
||||||
|
|
||||||
/**
|
public AudioGainFilter(float minGain, float maxGain, float objectiveAmplitude)
|
||||||
* Constructs an instance from the foreign memory segment
|
|
||||||
*/
|
|
||||||
public RspDuoModeCallbackParameters(MemorySegment rspDuoModeCbParam)
|
|
||||||
{
|
{
|
||||||
mRspDuoModeEventType = RspDuoModeEventType.fromValue(sdrplay_api_RspDuoModeCbParamT.modeChangeType(rspDuoModeCbParam));
|
mAudioGain = new AudioGainAndDcFilter(minGain, maxGain, objectiveAmplitude);
|
||||||
|
mAudioGain.setDecayRate(2); // to remove pumping effect
|
||||||
|
mAudioGain.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@Override
|
||||||
* Event type
|
public float[] filter(float[] audio)
|
||||||
*/
|
|
||||||
public RspDuoModeEventType getRspDuoModeEvent()
|
|
||||||
{
|
{
|
||||||
return mRspDuoModeEventType;
|
return mAudioGain.process(audio);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -32,6 +32,8 @@ import io.github.dsheirer.sample.real.IRealBufferListener;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides packaging of demodulated audio sample buffers into audio segments for broadcast to registered listeners.
|
* Provides packaging of demodulated audio sample buffers into audio segments for broadcast to registered listeners.
|
||||||
* Includes audio packet metadata in constructed audio segments.
|
* Includes audio packet metadata in constructed audio segments.
|
||||||
@@ -42,36 +44,7 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
|
|||||||
Listener<float[]>
|
Listener<float[]>
|
||||||
{
|
{
|
||||||
private static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
|
private static final Logger mLog = LoggerFactory.getLogger(AudioModule.class);
|
||||||
private static float[] sHighPassFilterCoefficients;
|
private List<AbstractAudioFilter>mAudioFilters;
|
||||||
private final boolean mAudioFilterEnable;
|
|
||||||
|
|
||||||
static
|
|
||||||
{
|
|
||||||
FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
|
|
||||||
.sampleRate(8000)
|
|
||||||
.stopBandCutoff(200)
|
|
||||||
.stopBandAmplitude(0.0)
|
|
||||||
.stopBandRipple(0.025)
|
|
||||||
.passBandStart(300)
|
|
||||||
.passBandAmplitude(1.0)
|
|
||||||
.passBandRipple(0.01)
|
|
||||||
.build();
|
|
||||||
try
|
|
||||||
{
|
|
||||||
RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
|
|
||||||
|
|
||||||
if(designer.isValid())
|
|
||||||
{
|
|
||||||
sHighPassFilterCoefficients = designer.getImpulseResponse();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch(FilterDesignException fde)
|
|
||||||
{
|
|
||||||
mLog.error("Filter design error", fde);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private final IRealFilter mHighPassFilter = FilterFactory.getRealFilter(sHighPassFilterCoefficients);
|
|
||||||
private final SquelchStateListener mSquelchStateListener = new SquelchStateListener();
|
private final SquelchStateListener mSquelchStateListener = new SquelchStateListener();
|
||||||
private SquelchState mSquelchState = SquelchState.SQUELCH;
|
private SquelchState mSquelchState = SquelchState.SQUELCH;
|
||||||
|
|
||||||
@@ -81,23 +54,23 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
|
|||||||
* @param aliasList for aliasing identifiers
|
* @param aliasList for aliasing identifiers
|
||||||
* @param timeslot for this audio module
|
* @param timeslot for this audio module
|
||||||
* @param maxAudioSegmentLength in milliseconds
|
* @param maxAudioSegmentLength in milliseconds
|
||||||
* @param audioFilterEnable to enable or disable high-pass audio filter
|
* @param audioFilters a list of audio filters to apply to the incoming audio samples
|
||||||
*/
|
*/
|
||||||
public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength, boolean audioFilterEnable)
|
public AudioModule(AliasList aliasList, int timeslot, long maxAudioSegmentLength, List<AbstractAudioFilter> audioFilters)
|
||||||
{
|
{
|
||||||
super(aliasList, timeslot, maxAudioSegmentLength);
|
super(aliasList, timeslot, maxAudioSegmentLength);
|
||||||
mAudioFilterEnable = audioFilterEnable;
|
mAudioFilters = audioFilters;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an Audio Module.
|
* Creates an Audio Module.
|
||||||
* @param aliasList for aliasing identifiers
|
* @param aliasList for aliasing identifiers
|
||||||
* @param audioFilterEnable to enable or disable high-pass audio filter
|
* @param audioFilters a list of audio filters to apply to the incoming audio samples
|
||||||
*/
|
*/
|
||||||
public AudioModule(AliasList aliasList, boolean audioFilterEnable)
|
public AudioModule(AliasList aliasList, List<AbstractAudioFilter> audioFilters)
|
||||||
{
|
{
|
||||||
super(aliasList);
|
super(aliasList);
|
||||||
mAudioFilterEnable = audioFilterEnable;
|
mAudioFilters = audioFilters;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -128,9 +101,13 @@ public class AudioModule extends AbstractAudioModule implements ISquelchStateLis
|
|||||||
{
|
{
|
||||||
if(mSquelchState == SquelchState.UNSQUELCH)
|
if(mSquelchState == SquelchState.UNSQUELCH)
|
||||||
{
|
{
|
||||||
if(mAudioFilterEnable)
|
// apply audio filters if any (i.e. deemphasis, high pass, etc.)
|
||||||
|
if(!mAudioFilters.isEmpty())
|
||||||
{
|
{
|
||||||
audioBuffer = mHighPassFilter.filter(audioBuffer);
|
for(AbstractAudioFilter filter : mAudioFilters)
|
||||||
|
{
|
||||||
|
audioBuffer = filter.filter(audioBuffer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
addAudio(audioBuffer);
|
addAudio(audioBuffer);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2024 Dennis Sheirer
|
* Copyright (C) 2014-2026 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
|
||||||
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
|
|||||||
*
|
*
|
||||||
* Producers will add audio buffers and update identifiers throughout the life-cycle of an audio segment. The producer
|
* Producers will add audio buffers and update identifiers throughout the life-cycle of an audio segment. The producer
|
||||||
* will signal the completion of an audio segment by setting the complete property to true. This allows consumers the
|
* will signal the completion of an audio segment by setting the complete property to true. This allows consumers the
|
||||||
* option to process the audio buffers throughout the life-cycle of the segment, or to process all of the buffers once
|
* option to process the audio buffers throughout the life-cycle of the segment, or to process all the buffers once
|
||||||
* the segment is complete.
|
* the segment is complete.
|
||||||
*/
|
*/
|
||||||
public class AudioSegment implements Listener<IdentifierUpdateNotification>
|
public class AudioSegment implements Listener<IdentifierUpdateNotification>
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
package io.github.dsheirer.audio;
|
||||||
|
|
||||||
|
import io.github.dsheirer.dsp.filter.FilterFactory;
|
||||||
|
import io.github.dsheirer.dsp.filter.design.FilterDesignException;
|
||||||
|
import io.github.dsheirer.dsp.filter.fir.FIRFilterSpecification;
|
||||||
|
import io.github.dsheirer.dsp.filter.fir.real.IRealFilter;
|
||||||
|
import io.github.dsheirer.dsp.filter.fir.remez.RemezFIRFilterDesigner;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
public class HighPassAudioFilter extends AbstractAudioFilter
|
||||||
|
{
|
||||||
|
private static final Logger mLog = LoggerFactory.getLogger(HighPassAudioFilter.class);
|
||||||
|
private static float[] sHighPassFilterCoefficients;
|
||||||
|
|
||||||
|
static
|
||||||
|
{
|
||||||
|
FIRFilterSpecification specification = FIRFilterSpecification.highPassBuilder()
|
||||||
|
.sampleRate(8000)
|
||||||
|
.stopBandCutoff(200)
|
||||||
|
.stopBandAmplitude(0.0)
|
||||||
|
.stopBandRipple(0.025)
|
||||||
|
.passBandStart(300)
|
||||||
|
.passBandAmplitude(1.0)
|
||||||
|
.passBandRipple(0.01)
|
||||||
|
.build();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
RemezFIRFilterDesigner designer = new RemezFIRFilterDesigner(specification);
|
||||||
|
|
||||||
|
if(designer.isValid())
|
||||||
|
{
|
||||||
|
sHighPassFilterCoefficients = designer.getImpulseResponse();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch(FilterDesignException fde)
|
||||||
|
{
|
||||||
|
mLog.error("Filter design error", fde);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private final IRealFilter mHighPassFilter = FilterFactory.getRealFilter(sHighPassFilterCoefficients);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public float[] filter(float[] audio)
|
||||||
|
{
|
||||||
|
audio = mHighPassFilter.filter(audio);
|
||||||
|
return audio;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,9 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.audio;
|
package io.github.dsheirer.audio;
|
||||||
|
|
||||||
import io.github.dsheirer.audio.playback.AudioOutput;
|
import io.github.dsheirer.audio.playback.AudioChannel;
|
||||||
|
import io.github.dsheirer.audio.playback.AudioPlaybackDeviceDescriptor;
|
||||||
import io.github.dsheirer.sample.Listener;
|
import io.github.dsheirer.sample.Listener;
|
||||||
import io.github.dsheirer.source.mixer.MixerChannelConfiguration;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -12,13 +30,13 @@ import java.util.List;
|
|||||||
public interface IAudioController
|
public interface IAudioController
|
||||||
{
|
{
|
||||||
/* Current Mixer and MixerChannel configuration */
|
/* Current Mixer and MixerChannel configuration */
|
||||||
public void setMixerChannelConfiguration( MixerChannelConfiguration entry ) throws AudioException;
|
public void setAudioPlaybackDevice(AudioPlaybackDeviceDescriptor device ) throws AudioException;
|
||||||
public MixerChannelConfiguration getMixerChannelConfiguration() throws AudioException;
|
public AudioPlaybackDeviceDescriptor getAudioPlaybackDevice() throws AudioException;
|
||||||
|
|
||||||
/* Audio Output(s) */
|
/* Audio Channel(s) */
|
||||||
public List<AudioOutput> getAudioOutputs();
|
public List<AudioChannel> getAudioChannels();
|
||||||
|
|
||||||
/* Controller Audio Event Listener */
|
/* Controller Audio Event Listener */
|
||||||
public void addControllerListener( Listener<AudioEvent> listener );
|
public void addAudioEventListener(Listener<AudioEvent> listener );
|
||||||
public void removeControllerListener( Listener<AudioEvent> listener );
|
public void removeAudioEventListener(Listener<AudioEvent> listener );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
|
|||||||
protected ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>(BroadcastState.READY);
|
protected ObjectProperty<BroadcastState> mBroadcastState = new SimpleObjectProperty<>(BroadcastState.READY);
|
||||||
protected ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
|
protected ObjectProperty<BroadcastState> mLastBadBroadcastState = new SimpleObjectProperty<>();
|
||||||
protected int mStreamedAudioCount = 0;
|
protected int mStreamedAudioCount = 0;
|
||||||
|
protected int mDuplicateRejectedAudioCount = 0;
|
||||||
protected int mErrorAudioCount = 0;
|
protected int mErrorAudioCount = 0;
|
||||||
protected int mAgedOffAudioCount = 0;
|
protected int mAgedOffAudioCount = 0;
|
||||||
|
|
||||||
@@ -163,6 +164,22 @@ public abstract class AbstractAudioBroadcaster<T extends BroadcastConfiguration>
|
|||||||
mStreamedAudioCount++;
|
mStreamedAudioCount++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Number of audio recordings rejected by the remote service as duplicates.
|
||||||
|
*/
|
||||||
|
public int getDuplicateRejectedAudioCount()
|
||||||
|
{
|
||||||
|
return mDuplicateRejectedAudioCount;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Increments the duplicate-rejected audio count by one.
|
||||||
|
*/
|
||||||
|
public void incrementDuplicateRejectedAudioCount()
|
||||||
|
{
|
||||||
|
mDuplicateRejectedAudioCount++;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Number of audio recordings that were removed for exceeding age limit
|
* Number of audio recordings that were removed for exceeding age limit
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
|||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
|
||||||
import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyCallConfiguration;
|
import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyCallConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
|
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
|
||||||
|
import io.github.dsheirer.audio.broadcast.thinline.ThinlineRadioConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
|
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.icecast.IcecastConfiguration;
|
import io.github.dsheirer.audio.broadcast.icecast.IcecastConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.shoutcast.v1.ShoutcastV1Configuration;
|
import io.github.dsheirer.audio.broadcast.shoutcast.v1.ShoutcastV1Configuration;
|
||||||
@@ -49,6 +50,7 @@ import java.net.SocketAddress;
|
|||||||
@JsonSubTypes({
|
@JsonSubTypes({
|
||||||
@JsonSubTypes.Type(value = BroadcastifyCallConfiguration.class, name="broadcastifyCallConfiguration"),
|
@JsonSubTypes.Type(value = BroadcastifyCallConfiguration.class, name="broadcastifyCallConfiguration"),
|
||||||
@JsonSubTypes.Type(value = RdioScannerConfiguration.class, name="RdioScannerConfiguration"),
|
@JsonSubTypes.Type(value = RdioScannerConfiguration.class, name="RdioScannerConfiguration"),
|
||||||
|
@JsonSubTypes.Type(value = ThinlineRadioConfiguration.class, name="ThinlineRadioConfiguration"),
|
||||||
@JsonSubTypes.Type(value = OpenMHzConfiguration.class, name="OpenMHzConfiguration"),
|
@JsonSubTypes.Type(value = OpenMHzConfiguration.class, name="OpenMHzConfiguration"),
|
||||||
@JsonSubTypes.Type(value = IcecastConfiguration.class, name="icecastConfiguration"),
|
@JsonSubTypes.Type(value = IcecastConfiguration.class, name="icecastConfiguration"),
|
||||||
@JsonSubTypes.Type(value = ShoutcastV1Configuration.class, name="shoutcastV1Configuration"),
|
@JsonSubTypes.Type(value = ShoutcastV1Configuration.class, name="shoutcastV1Configuration"),
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ public class BroadcastEvent
|
|||||||
BROADCASTER_QUEUE_CHANGE,
|
BROADCASTER_QUEUE_CHANGE,
|
||||||
BROADCASTER_STATE_CHANGE,
|
BROADCASTER_STATE_CHANGE,
|
||||||
BROADCASTER_STREAMED_COUNT_CHANGE,
|
BROADCASTER_STREAMED_COUNT_CHANGE,
|
||||||
|
BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE,
|
||||||
BROADCASTER_AGED_OFF_COUNT_CHANGE,
|
BROADCASTER_AGED_OFF_COUNT_CHANGE,
|
||||||
BROADCASTER_ERROR_COUNT_CHANGE,
|
BROADCASTER_ERROR_COUNT_CHANGE,
|
||||||
BROADCASTER_DELETE,
|
BROADCASTER_DELETE,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyCallConfigura
|
|||||||
import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyFeedConfiguration;
|
import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyFeedConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerBroadcaster;
|
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerBroadcaster;
|
||||||
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
|
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
|
||||||
|
import io.github.dsheirer.audio.broadcast.thinline.ThinlineRadioConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerFeedConfiguration;
|
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerFeedConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
|
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
|
||||||
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
|
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
|
||||||
@@ -68,6 +69,7 @@ public class BroadcastFactory
|
|||||||
return new BroadcastifyCallBroadcaster((BroadcastifyCallConfiguration)configuration,
|
return new BroadcastifyCallBroadcaster((BroadcastifyCallConfiguration)configuration,
|
||||||
inputAudioFormat, mp3Setting, aliasModel);
|
inputAudioFormat, mp3Setting, aliasModel);
|
||||||
case RDIOSCANNER_CALL:
|
case RDIOSCANNER_CALL:
|
||||||
|
case THINLINE_RADIO:
|
||||||
return new RdioScannerBroadcaster((RdioScannerConfiguration)configuration,
|
return new RdioScannerBroadcaster((RdioScannerConfiguration)configuration,
|
||||||
inputAudioFormat, mp3Setting, aliasModel);
|
inputAudioFormat, mp3Setting, aliasModel);
|
||||||
case OPENMHZ:
|
case OPENMHZ:
|
||||||
@@ -113,6 +115,8 @@ public class BroadcastFactory
|
|||||||
return new BroadcastifyCallConfiguration(format);
|
return new BroadcastifyCallConfiguration(format);
|
||||||
case RDIOSCANNER_CALL:
|
case RDIOSCANNER_CALL:
|
||||||
return new RdioScannerConfiguration(format);
|
return new RdioScannerConfiguration(format);
|
||||||
|
case THINLINE_RADIO:
|
||||||
|
return new ThinlineRadioConfiguration(format);
|
||||||
case BROADCASTIFY:
|
case BROADCASTIFY:
|
||||||
return new BroadcastifyFeedConfiguration(format);
|
return new BroadcastifyFeedConfiguration(format);
|
||||||
case OPENMHZ:
|
case OPENMHZ:
|
||||||
|
|||||||
@@ -62,11 +62,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
public static final int COLUMN_BROADCASTER_STATUS = 2;
|
public static final int COLUMN_BROADCASTER_STATUS = 2;
|
||||||
public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
|
public static final int COLUMN_BROADCASTER_QUEUE_SIZE = 3;
|
||||||
public static final int COLUMN_BROADCASTER_STREAMED_COUNT = 4;
|
public static final int COLUMN_BROADCASTER_STREAMED_COUNT = 4;
|
||||||
public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 5;
|
public static final int COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT = 5;
|
||||||
public static final int COLUMN_BROADCASTER_ERROR_COUNT = 6;
|
public static final int COLUMN_BROADCASTER_AGED_OFF_COUNT = 6;
|
||||||
|
public static final int COLUMN_BROADCASTER_ERROR_COUNT = 7;
|
||||||
|
|
||||||
public static final String[] COLUMN_NAMES = new String[]
|
public static final String[] COLUMN_NAMES = new String[]
|
||||||
{"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Aged Off", "Upload Error"};
|
{"Stream Type", "Name", "Status", "Queued", "Streamed/Uploaded", "Duplicate Rejected", "Aged Off", "Upload Error"};
|
||||||
|
|
||||||
private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
|
private ObservableList<ConfiguredBroadcast> mConfiguredBroadcasts =
|
||||||
FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
|
FXCollections.observableArrayList(ConfiguredBroadcast.extractor());
|
||||||
@@ -361,7 +362,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
}
|
}
|
||||||
|
|
||||||
broadcast(new BroadcastEvent(audioBroadcaster, BroadcastEvent.Event.BROADCASTER_ADD));
|
broadcast(new BroadcastEvent(audioBroadcaster, BroadcastEvent.Event.BROADCASTER_ADD));
|
||||||
ThreadPool.CACHED.submit(audioBroadcaster::start);
|
ThreadPool.CACHED.submit(() -> audioBroadcaster.start());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -531,6 +532,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
fireTableCellUpdated(row, COLUMN_BROADCASTER_STREAMED_COUNT);
|
fireTableCellUpdated(row, COLUMN_BROADCASTER_STREAMED_COUNT);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE:
|
||||||
|
if(row >= 0)
|
||||||
|
{
|
||||||
|
fireTableCellUpdated(row, COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT);
|
||||||
|
}
|
||||||
|
break;
|
||||||
case BROADCASTER_AGED_OFF_COUNT_CHANGE:
|
case BROADCASTER_AGED_OFF_COUNT_CHANGE:
|
||||||
if(row >= 0)
|
if(row >= 0)
|
||||||
{
|
{
|
||||||
@@ -607,6 +614,12 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
return configuredBroadcast.getAudioBroadcaster().getStreamedAudioCount();
|
return configuredBroadcast.getAudioBroadcaster().getStreamedAudioCount();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
|
||||||
|
if(configuredBroadcast.hasAudioBroadcaster())
|
||||||
|
{
|
||||||
|
return configuredBroadcast.getAudioBroadcaster().getDuplicateRejectedAudioCount();
|
||||||
|
}
|
||||||
|
break;
|
||||||
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
||||||
if(configuredBroadcast.hasAudioBroadcaster())
|
if(configuredBroadcast.hasAudioBroadcaster())
|
||||||
{
|
{
|
||||||
@@ -643,6 +656,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener<Audio
|
|||||||
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
case COLUMN_BROADCASTER_AGED_OFF_COUNT:
|
||||||
case COLUMN_BROADCASTER_QUEUE_SIZE:
|
case COLUMN_BROADCASTER_QUEUE_SIZE:
|
||||||
case COLUMN_BROADCASTER_STREAMED_COUNT:
|
case COLUMN_BROADCASTER_STREAMED_COUNT:
|
||||||
|
case COLUMN_BROADCASTER_DUPLICATE_REJECTED_COUNT:
|
||||||
case COLUMN_BROADCASTER_ERROR_COUNT:
|
case COLUMN_BROADCASTER_ERROR_COUNT:
|
||||||
return Integer.class;
|
return Integer.class;
|
||||||
case COLUMN_BROADCAST_SERVER_TYPE:
|
case COLUMN_BROADCAST_SERVER_TYPE:
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ public enum BroadcastServerType
|
|||||||
|
|
||||||
ICECAST_HTTP("Icecast 2 (v2.4+)", "images/icecast.png"),
|
ICECAST_HTTP("Icecast 2 (v2.4+)", "images/icecast.png"),
|
||||||
RDIOSCANNER_CALL("Rdio Scanner", "images/rdioscanner.png"),
|
RDIOSCANNER_CALL("Rdio Scanner", "images/rdioscanner.png"),
|
||||||
|
THINLINE_RADIO("Thinline Radio", "images/rdioscanner.png"),
|
||||||
OPENMHZ("OpenMHz", "images/openmhz.png"),
|
OPENMHZ("OpenMHz", "images/openmhz.png"),
|
||||||
ICECAST_TCP("Icecast (v2.3)", "images/icecast.png"),
|
ICECAST_TCP("Icecast (v2.3)", "images/icecast.png"),
|
||||||
SHOUTCAST_V1("Shoutcast v1.x", "images/shoutcast.png"),
|
SHOUTCAST_V1("Shoutcast v1.x", "images/shoutcast.png"),
|
||||||
|
|||||||
@@ -151,7 +151,10 @@ public class BroadcastStatusPanel extends JPanel
|
|||||||
else if(state == BroadcastState.DISABLED)
|
else if(state == BroadcastState.DISABLED)
|
||||||
{
|
{
|
||||||
setBackground(table.getBackground());
|
setBackground(table.getBackground());
|
||||||
setForeground(Color.LIGHT_GRAY);
|
//Use the LAF's disabled-foreground so the cell reads correctly on any
|
||||||
|
//theme - LIGHT_GRAY is invisible on a light background.
|
||||||
|
Color disabled = javax.swing.UIManager.getColor("Label.disabledForeground");
|
||||||
|
setForeground(disabled != null ? disabled : table.getForeground());
|
||||||
}
|
}
|
||||||
else if(state == BroadcastState.INVALID_SETTINGS ||
|
else if(state == BroadcastState.INVALID_SETTINGS ||
|
||||||
state == BroadcastState.NETWORK_UNAVAILABLE)
|
state == BroadcastState.NETWORK_UNAVAILABLE)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2025 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,6 +20,8 @@
|
|||||||
package io.github.dsheirer.audio.broadcast.broadcastify;
|
package io.github.dsheirer.audio.broadcast.broadcastify;
|
||||||
|
|
||||||
import com.google.common.net.HttpHeaders;
|
import com.google.common.net.HttpHeaders;
|
||||||
|
import io.github.dsheirer.alias.Alias;
|
||||||
|
import io.github.dsheirer.alias.AliasList;
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
|
import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
|
||||||
import io.github.dsheirer.audio.broadcast.AudioRecording;
|
import io.github.dsheirer.audio.broadcast.AudioRecording;
|
||||||
@@ -32,6 +34,8 @@ import io.github.dsheirer.identifier.Form;
|
|||||||
import io.github.dsheirer.identifier.Identifier;
|
import io.github.dsheirer.identifier.Identifier;
|
||||||
import io.github.dsheirer.identifier.IdentifierClass;
|
import io.github.dsheirer.identifier.IdentifierClass;
|
||||||
import io.github.dsheirer.identifier.Role;
|
import io.github.dsheirer.identifier.Role;
|
||||||
|
import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
|
||||||
|
import io.github.dsheirer.identifier.configuration.AliasListConfigurationIdentifier;
|
||||||
import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
|
import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
|
||||||
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;
|
||||||
@@ -45,6 +49,7 @@ import java.net.http.HttpClient;
|
|||||||
import java.net.http.HttpRequest;
|
import java.net.http.HttpRequest;
|
||||||
import java.net.http.HttpResponse;
|
import java.net.http.HttpResponse;
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
import java.util.concurrent.CompletionException;
|
import java.util.concurrent.CompletionException;
|
||||||
import java.util.concurrent.LinkedTransferQueue;
|
import java.util.concurrent.LinkedTransferQueue;
|
||||||
@@ -76,6 +81,7 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
.build();
|
.build();
|
||||||
private long mLastConnectionAttempt;
|
private long mLastConnectionAttempt;
|
||||||
private long mConnectionAttemptInterval = 5000; //Every 5 seconds
|
private long mConnectionAttemptInterval = 5000; //Every 5 seconds
|
||||||
|
final private AliasModel mAliasModel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs an instance of the broadcaster
|
* Constructs an instance of the broadcaster
|
||||||
@@ -86,6 +92,7 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
MP3Setting mp3Setting, AliasModel aliasModel)
|
MP3Setting mp3Setting, AliasModel aliasModel)
|
||||||
{
|
{
|
||||||
super(config);
|
super(config);
|
||||||
|
mAliasModel = aliasModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -247,6 +254,8 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
String radioId = getFrom(audioRecording);
|
String radioId = getFrom(audioRecording);
|
||||||
float frequency = getFrequency(audioRecording);
|
float frequency = getFrequency(audioRecording);
|
||||||
|
|
||||||
|
String radioIdAlias = getFromAlias(audioRecording);
|
||||||
|
|
||||||
BroadcastifyCallBuilder bodyBuilder = new BroadcastifyCallBuilder();
|
BroadcastifyCallBuilder bodyBuilder = new BroadcastifyCallBuilder();
|
||||||
bodyBuilder.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
|
bodyBuilder.addPart(FormField.API_KEY, getBroadcastConfiguration().getApiKey())
|
||||||
.addPart(FormField.SYSTEM_ID, getBroadcastConfiguration().getSystemID())
|
.addPart(FormField.SYSTEM_ID, getBroadcastConfiguration().getSystemID())
|
||||||
@@ -257,6 +266,11 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
.addPart(FormField.FREQUENCY, frequency)
|
.addPart(FormField.FREQUENCY, frequency)
|
||||||
.addPart(FormField.ENCODING, ENCODING_TYPE_MP3);
|
.addPart(FormField.ENCODING, ENCODING_TYPE_MP3);
|
||||||
|
|
||||||
|
if(radioIdAlias != null && !radioIdAlias.isEmpty())
|
||||||
|
{
|
||||||
|
bodyBuilder.addPart(FormField.RADIO_ID_ALIAS, radioIdAlias);
|
||||||
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
HttpRequest request = HttpRequest.newBuilder()
|
HttpRequest request = HttpRequest.newBuilder()
|
||||||
@@ -356,6 +370,9 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
else if(urlResponse.startsWith("1 SKIPPED"))
|
else if(urlResponse.startsWith("1 SKIPPED"))
|
||||||
{
|
{
|
||||||
//Broadcastify is telling us to skip audio upload - someone already uploaded it
|
//Broadcastify is telling us to skip audio upload - someone already uploaded it
|
||||||
|
incrementDuplicateRejectedAudioCount();
|
||||||
|
broadcast(new BroadcastEvent(BroadcastifyCallBroadcaster.this,
|
||||||
|
BroadcastEvent.Event.BROADCASTER_DUPLICATE_REJECTED_COUNT_CHANGE));
|
||||||
audioRecording.removePendingReplay();
|
audioRecording.removePendingReplay();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -440,13 +457,58 @@ public class BroadcastifyCallBroadcaster extends AbstractAudioBroadcaster<Broadc
|
|||||||
return "0";
|
return "0";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolves the over-the-air talker alias for the FROM (source radio) identifier, acquired in real-time from RF
|
||||||
|
* (e.g. P25 Motorola Talker Alias or DMR Talker Alias). Returns null if no OTA alias was received for this call.
|
||||||
|
* This is sent as the srcId_alias field in Broadcastify uploads.
|
||||||
|
*/
|
||||||
|
private static String getFromAlias(AudioRecording audioRecording)
|
||||||
|
{
|
||||||
|
for(Identifier identifier: audioRecording.getIdentifierCollection().getIdentifiers(Role.FROM))
|
||||||
|
{
|
||||||
|
if(identifier instanceof TalkerAliasIdentifier talkerAliasIdentifier)
|
||||||
|
{
|
||||||
|
if(talkerAliasIdentifier.isValid())
|
||||||
|
{
|
||||||
|
return talkerAliasIdentifier.getValue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a formatted string with the TO identifiers or uses a default of zero (0)
|
* Creates a formatted string with the TO identifiers or uses a default of zero (0)
|
||||||
*/
|
*/
|
||||||
private static String getTo(AudioRecording audioRecording)
|
private String getTo(AudioRecording audioRecording)
|
||||||
{
|
{
|
||||||
Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
|
Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
|
||||||
|
|
||||||
|
//Alias the TO value when the user specifies a 'Stream As Talkgroup'
|
||||||
|
if(identifier != null)
|
||||||
|
{
|
||||||
|
AliasListConfigurationIdentifier config = audioRecording.getIdentifierCollection().getAliasListConfiguration();
|
||||||
|
|
||||||
|
if(config != null)
|
||||||
|
{
|
||||||
|
AliasList aliasList = mAliasModel.getAliasList(config.getValue());
|
||||||
|
|
||||||
|
if(aliasList != null)
|
||||||
|
{
|
||||||
|
List<Alias> aliases = aliasList.getAliases(identifier);
|
||||||
|
|
||||||
|
for(Alias a: aliases)
|
||||||
|
{
|
||||||
|
if(a.getStreamTalkgroupAlias() != null)
|
||||||
|
{
|
||||||
|
return String.valueOf(a.getStreamTalkgroupAlias().getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
|
if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
|
||||||
{
|
{
|
||||||
return format(patchGroupIdentifier);
|
return format(patchGroupIdentifier);
|
||||||
|
|||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2024 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 io.github.dsheirer.audio.broadcast.broadcastify;
|
package io.github.dsheirer.audio.broadcast.broadcastify;
|
||||||
|
|
||||||
@@ -35,6 +32,7 @@ public class BroadcastifyFeedConfiguration extends IcecastTCPConfiguration
|
|||||||
private final static Logger mLog = LoggerFactory.getLogger(BroadcastifyFeedConfiguration.class);
|
private final static Logger mLog = LoggerFactory.getLogger(BroadcastifyFeedConfiguration.class);
|
||||||
|
|
||||||
private int mFeedID;
|
private int mFeedID;
|
||||||
|
private boolean mVerboseLogging = false;
|
||||||
|
|
||||||
public BroadcastifyFeedConfiguration()
|
public BroadcastifyFeedConfiguration()
|
||||||
{
|
{
|
||||||
@@ -123,4 +121,15 @@ public class BroadcastifyFeedConfiguration extends IcecastTCPConfiguration
|
|||||||
{
|
{
|
||||||
mFeedID = feedID;
|
mFeedID = feedID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "verbose_logging")
|
||||||
|
public boolean isVerboseLogging()
|
||||||
|
{
|
||||||
|
return mVerboseLogging;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVerboseLogging(boolean verboseLogging)
|
||||||
|
{
|
||||||
|
mVerboseLogging = verboseLogging;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,6 +30,7 @@ public enum FormField
|
|||||||
TIMESTAMP("ts"),
|
TIMESTAMP("ts"),
|
||||||
TALKGROUP_ID("tg"),
|
TALKGROUP_ID("tg"),
|
||||||
RADIO_ID("src"),
|
RADIO_ID("src"),
|
||||||
|
RADIO_ID_ALIAS("srcId_alias"),
|
||||||
FREQUENCY("freq"),
|
FREQUENCY("freq"),
|
||||||
ENCODING("enc"),
|
ENCODING("enc"),
|
||||||
TEST("test");
|
TEST("test");
|
||||||
|
|||||||
@@ -52,8 +52,10 @@ import org.slf4j.LoggerFactory;
|
|||||||
public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
||||||
{
|
{
|
||||||
private static final Logger mLog = LoggerFactory.getLogger(IcecastHTTPAudioBroadcaster.class);
|
private static final Logger mLog = LoggerFactory.getLogger(IcecastHTTPAudioBroadcaster.class);
|
||||||
|
private static final long CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS = 5000; // 5 seconds
|
||||||
private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
|
private static final long RECONNECT_INTERVAL_MILLISECONDS = 30000; //30 seconds
|
||||||
private static final String HTTP_1_0_OK_HEX_DUMP = "48 54 54 50 2F 31 2E 30 20 32 30 30 20 4F 4B";
|
private static final String HTTP_1_0_OK_HEX_DUMP = "48 54 54 50 2F 31 2E 30 20 32 30 30 20 4F 4B";
|
||||||
|
private static final String HTTP_1_1_CONTINUE_HEX_DUMP = "48 54 54 50 2F 31 2E 31 20 31 30 30";
|
||||||
|
|
||||||
private NioSocketConnector mSocketConnector;
|
private NioSocketConnector mSocketConnector;
|
||||||
private IoSession mStreamingSession = null;
|
private IoSession mStreamingSession = null;
|
||||||
@@ -61,6 +63,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
|
|
||||||
private long mLastConnectionAttempt = 0;
|
private long mLastConnectionAttempt = 0;
|
||||||
private AtomicBoolean mConnecting = new AtomicBoolean();
|
private AtomicBoolean mConnecting = new AtomicBoolean();
|
||||||
|
private AtomicBoolean mConnectionFailureLogged = new AtomicBoolean(false);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates an Icecast 2.4.x compatible broadcaster using HTTP 1.1 protocol. This broadcaster is
|
* Creates an Icecast 2.4.x compatible broadcaster using HTTP 1.1 protocol. This broadcaster is
|
||||||
@@ -141,7 +144,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
if(mSocketConnector == null)
|
if(mSocketConnector == null)
|
||||||
{
|
{
|
||||||
mSocketConnector = new NioSocketConnector();
|
mSocketConnector = new NioSocketConnector();
|
||||||
mSocketConnector.setConnectTimeoutCheckInterval(10000);
|
mSocketConnector.setConnectTimeoutMillis(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
|
||||||
|
mSocketConnector.setConnectTimeoutCheckInterval(1000);
|
||||||
|
|
||||||
// LoggingFilter loggingFilter = new LoggingFilter(IcecastHTTPAudioBroadcaster.class);
|
// LoggingFilter loggingFilter = new LoggingFilter(IcecastHTTPAudioBroadcaster.class);
|
||||||
// loggingFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
|
// loggingFilter.setMessageReceivedLogLevel(LogLevel.DEBUG);
|
||||||
@@ -160,37 +164,58 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
{
|
{
|
||||||
setBroadcastState(BroadcastState.CONNECTING);
|
setBroadcastState(BroadcastState.CONNECTING);
|
||||||
|
|
||||||
try
|
try {
|
||||||
{
|
|
||||||
ConnectFuture future = mSocketConnector
|
ConnectFuture future = mSocketConnector
|
||||||
.connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
|
.connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
|
||||||
getBroadcastConfiguration().getPort()));
|
getBroadcastConfiguration().getPort()));
|
||||||
future.awaitUninterruptibly();
|
|
||||||
mStreamingSession = future.getSession();
|
boolean connected;
|
||||||
}
|
try {
|
||||||
catch(RuntimeIoException rie)
|
connected = future.await(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
|
||||||
{
|
} catch (InterruptedException ie) {
|
||||||
|
Thread.currentThread().interrupt();
|
||||||
|
if (mConnectionFailureLogged.compareAndSet(false, true)) {
|
||||||
|
mLog.debug("HTTP connect attempt interrupted");
|
||||||
|
}
|
||||||
|
setBroadcastState(BroadcastState.DISCONNECTED);
|
||||||
|
mLastConnectionAttempt = System.currentTimeMillis();
|
||||||
|
future.cancel();
|
||||||
|
disconnect();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (connected && future.isConnected()) {
|
||||||
|
mStreamingSession = future.getSession();
|
||||||
|
mConnecting.set(false);
|
||||||
|
mConnectionFailureLogged.set(false);
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
if (mConnectionFailureLogged.compareAndSet(false, true)) {
|
||||||
|
mLog.debug("HTTP connect attempt timed out ({} ms) or not connected",
|
||||||
|
CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS);
|
||||||
|
}
|
||||||
|
setBroadcastState(BroadcastState.DISCONNECTED);
|
||||||
|
mLastConnectionAttempt = System.currentTimeMillis();
|
||||||
|
future.cancel();
|
||||||
|
disconnect();
|
||||||
|
}
|
||||||
|
} catch (RuntimeIoException rie) {
|
||||||
Throwable throwableCause = rie.getCause();
|
Throwable throwableCause = rie.getCause();
|
||||||
|
setBroadcastState(BroadcastState.DISCONNECTED);
|
||||||
if(throwableCause instanceof ConnectException)
|
if (mConnectionFailureLogged.compareAndSet(false, true)) {
|
||||||
{
|
if (throwableCause != null) {
|
||||||
setBroadcastState(BroadcastState.NO_SERVER);
|
mLog.debug("Failed to connect", rie);
|
||||||
}
|
} else {
|
||||||
else if(throwableCause != null)
|
mLog.debug("Failed to connect - no exception is available");
|
||||||
{
|
}
|
||||||
setBroadcastState(BroadcastState.DISCONNECTED);
|
}
|
||||||
mLog.debug("Failed to connect", rie);
|
mLastConnectionAttempt = System.currentTimeMillis();
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
setBroadcastState(BroadcastState.DISCONNECTED);
|
|
||||||
mLog.debug("Failed to connect - no exception is available");
|
|
||||||
}
|
|
||||||
|
|
||||||
disconnect();
|
disconnect();
|
||||||
|
} finally {
|
||||||
|
if (!connected()) {
|
||||||
|
mConnecting.set(false);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
mConnecting.set(false);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -210,6 +235,11 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
{
|
{
|
||||||
mStreamingSession.closeNow();
|
mStreamingSession.closeNow();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mLastConnectionAttempt = System.currentTimeMillis();
|
||||||
|
if(!getBroadcastState().isErrorState()) {
|
||||||
|
setBroadcastState(BroadcastState.DISCONNECTED);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -233,6 +263,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
{
|
{
|
||||||
mHTTPHeaders = new HashMap<>();
|
mHTTPHeaders = new HashMap<>();
|
||||||
mHTTPHeaders.put(IcecastHeader.ACCEPT.getValue(), "*/*");
|
mHTTPHeaders.put(IcecastHeader.ACCEPT.getValue(), "*/*");
|
||||||
|
mHTTPHeaders.put(IcecastHeader.EXPECT.getValue(), "100-continue");
|
||||||
mHTTPHeaders.put(IcecastHeader.CONTENT_TYPE.getValue(), getConfiguration().getBroadcastFormat().getValue());
|
mHTTPHeaders.put(IcecastHeader.CONTENT_TYPE.getValue(), getConfiguration().getBroadcastFormat().getValue());
|
||||||
mHTTPHeaders.put(IcecastHeader.USER_AGENT.getValue(), SystemProperties.getInstance().getApplicationName());
|
mHTTPHeaders.put(IcecastHeader.USER_AGENT.getValue(), SystemProperties.getInstance().getApplicationName());
|
||||||
mHTTPHeaders.put(IcecastHeader.AUTHORIZATION.getValue(), getConfiguration().getBase64EncodedCredentials());
|
mHTTPHeaders.put(IcecastHeader.AUTHORIZATION.getValue(), getConfiguration().getBase64EncodedCredentials());
|
||||||
@@ -288,6 +319,7 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
@Override
|
@Override
|
||||||
public void sessionClosed(IoSession session) throws Exception
|
public void sessionClosed(IoSession session) throws Exception
|
||||||
{
|
{
|
||||||
|
mLastConnectionAttempt = System.currentTimeMillis();
|
||||||
//If there is already an error state, don't override it. Otherwise, set state to disconnected
|
//If there is already an error state, don't override it. Otherwise, set state to disconnected
|
||||||
if(!getBroadcastState().isErrorState())
|
if(!getBroadcastState().isErrorState())
|
||||||
{
|
{
|
||||||
@@ -320,9 +352,10 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
{
|
{
|
||||||
String hexDump = ((ProtocolDecoderException)throwable).getHexdump();
|
String hexDump = ((ProtocolDecoderException)throwable).getHexdump();
|
||||||
|
|
||||||
if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP))
|
if(hexDump.startsWith(HTTP_1_0_OK_HEX_DUMP) || hexDump.startsWith(HTTP_1_1_CONTINUE_HEX_DUMP))
|
||||||
{
|
{
|
||||||
setBroadcastState(BroadcastState.CONNECTED);
|
setBroadcastState(BroadcastState.CONNECTED);
|
||||||
|
mConnectionFailureLogged.set(false);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -401,10 +434,15 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
switch(response.getStatus())
|
switch(response.getStatus())
|
||||||
{
|
{
|
||||||
case INFORMATIONAL_CONTINUE:
|
case INFORMATIONAL_CONTINUE:
|
||||||
|
//Icecast 2.5+ signals that we can start sending audio with 100-continue
|
||||||
|
setBroadcastState(BroadcastState.CONNECTED);
|
||||||
|
mConnecting.set(false);
|
||||||
|
mConnectionFailureLogged.set(false);
|
||||||
break;
|
break;
|
||||||
case SUCCESS_OK:
|
case SUCCESS_OK:
|
||||||
setBroadcastState(BroadcastState.CONNECTED);
|
setBroadcastState(BroadcastState.CONNECTED);
|
||||||
mConnecting.set(false);
|
mConnecting.set(false);
|
||||||
|
mConnectionFailureLogged.set(false);
|
||||||
break;
|
break;
|
||||||
case CLIENT_ERROR_UNAUTHORIZED:
|
case CLIENT_ERROR_UNAUTHORIZED:
|
||||||
setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
|
setBroadcastState(BroadcastState.INVALID_CREDENTIALS);
|
||||||
@@ -468,7 +506,8 @@ public class IcecastHTTPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
|
|
||||||
mMessage = new String(bytes);
|
mMessage = new String(bytes);
|
||||||
|
|
||||||
Pattern pattern = Pattern.compile("HTTP/1.0 (\\d{3})");
|
//Icecast 2.4+ responds with HTTP/1.0 and Icecast 2.5+ responds with HTTP/1.1
|
||||||
|
Pattern pattern = Pattern.compile("HTTP/1\\.[01] (\\d{3})");
|
||||||
Matcher m = pattern.matcher(mMessage);
|
Matcher m = pattern.matcher(mMessage);
|
||||||
|
|
||||||
if(m.find())
|
if(m.find())
|
||||||
|
|||||||
@@ -1,23 +1,20 @@
|
|||||||
/*
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2025 Dennis Sheirer
|
||||||
*
|
*
|
||||||
* * ******************************************************************************
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* * Copyright (C) 2014-2020 Dennis Sheirer
|
* it under the terms of the GNU General Public License as published by
|
||||||
* *
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
* * This program is free software: you can redistribute it and/or modify
|
* (at your option) any later version.
|
||||||
* * 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/>
|
|
||||||
* * *****************************************************************************
|
|
||||||
*
|
*
|
||||||
|
* 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 io.github.dsheirer.audio.broadcast.icecast;
|
package io.github.dsheirer.audio.broadcast.icecast;
|
||||||
|
|
||||||
@@ -25,21 +22,16 @@ import com.google.common.base.Joiner;
|
|||||||
import io.github.dsheirer.alias.Alias;
|
import io.github.dsheirer.alias.Alias;
|
||||||
import io.github.dsheirer.alias.AliasList;
|
import io.github.dsheirer.alias.AliasList;
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.audio.broadcast.icecast.IcecastConfiguration;
|
|
||||||
import io.github.dsheirer.identifier.Form;
|
import io.github.dsheirer.identifier.Form;
|
||||||
import io.github.dsheirer.identifier.Identifier;
|
import io.github.dsheirer.identifier.Identifier;
|
||||||
import io.github.dsheirer.identifier.IdentifierClass;
|
import io.github.dsheirer.identifier.IdentifierClass;
|
||||||
import io.github.dsheirer.identifier.IdentifierCollection;
|
import io.github.dsheirer.identifier.IdentifierCollection;
|
||||||
import io.github.dsheirer.identifier.Role;
|
import io.github.dsheirer.identifier.Role;
|
||||||
import io.github.dsheirer.properties.SystemProperties;
|
import java.util.List;
|
||||||
import io.github.dsheirer.util.ThreadPool;
|
import java.util.Optional;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
public class IcecastMetadata
|
public class IcecastMetadata
|
||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(IcecastMetadata.class);
|
private final static Logger mLog = LoggerFactory.getLogger(IcecastMetadata.class);
|
||||||
@@ -73,13 +65,23 @@ public class IcecastMetadata
|
|||||||
|
|
||||||
if(to != null)
|
if(to != null)
|
||||||
{
|
{
|
||||||
sb.append("TO:").append(to);
|
|
||||||
|
|
||||||
List<Alias> aliases = aliasList.getAliases(to);
|
List<Alias> aliases = aliasList.getAliases(to);
|
||||||
|
|
||||||
if(aliases != null && !aliases.isEmpty())
|
//Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
|
||||||
|
Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
|
||||||
|
|
||||||
|
if(streamAs.isPresent())
|
||||||
{
|
{
|
||||||
sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
|
sb.append("TO:").append(streamAs.get().getStreamTalkgroupAlias().getValue());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sb.append("TO:").append(to);
|
||||||
|
|
||||||
|
if(!aliases.isEmpty())
|
||||||
|
{
|
||||||
|
sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2022 Dennis Sheirer
|
* Copyright (C) 2014-2024 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,6 +20,7 @@ package io.github.dsheirer.audio.broadcast.icecast;
|
|||||||
|
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastState;
|
import io.github.dsheirer.audio.broadcast.BroadcastState;
|
||||||
|
import io.github.dsheirer.audio.broadcast.broadcastify.BroadcastifyFeedConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.icecast.codec.IcecastCodecFactory;
|
import io.github.dsheirer.audio.broadcast.icecast.codec.IcecastCodecFactory;
|
||||||
import io.github.dsheirer.audio.convert.InputAudioFormat;
|
import io.github.dsheirer.audio.convert.InputAudioFormat;
|
||||||
import io.github.dsheirer.audio.convert.MP3AudioConverter;
|
import io.github.dsheirer.audio.convert.MP3AudioConverter;
|
||||||
@@ -39,6 +40,8 @@ import org.apache.mina.core.future.ConnectFuture;
|
|||||||
import org.apache.mina.core.service.IoHandlerAdapter;
|
import org.apache.mina.core.service.IoHandlerAdapter;
|
||||||
import org.apache.mina.core.session.IoSession;
|
import org.apache.mina.core.session.IoSession;
|
||||||
import org.apache.mina.filter.codec.ProtocolCodecFilter;
|
import org.apache.mina.filter.codec.ProtocolCodecFilter;
|
||||||
|
import org.apache.mina.filter.logging.LogLevel;
|
||||||
|
import org.apache.mina.filter.logging.LoggingFilter;
|
||||||
import org.apache.mina.transport.socket.nio.NioSocketConnector;
|
import org.apache.mina.transport.socket.nio.NioSocketConnector;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -56,6 +59,7 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
private IoSession mStreamingSession = null;
|
private IoSession mStreamingSession = null;
|
||||||
|
|
||||||
private long mLastConnectionAttempt = 0;
|
private long mLastConnectionAttempt = 0;
|
||||||
|
private boolean mVerboseLogging = false;
|
||||||
private AtomicBoolean mConnecting = new AtomicBoolean();
|
private AtomicBoolean mConnecting = new AtomicBoolean();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -73,6 +77,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
MP3Setting mp3Setting, AliasModel aliasModel)
|
MP3Setting mp3Setting, AliasModel aliasModel)
|
||||||
{
|
{
|
||||||
super(configuration, inputAudioFormat, mp3Setting, aliasModel);
|
super(configuration, inputAudioFormat, mp3Setting, aliasModel);
|
||||||
|
|
||||||
|
if(configuration instanceof BroadcastifyFeedConfiguration broadcastify)
|
||||||
|
{
|
||||||
|
mVerboseLogging = broadcastify.isVerboseLogging();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -85,7 +94,6 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
{
|
{
|
||||||
if(mInlineActive)
|
if(mInlineActive)
|
||||||
{
|
{
|
||||||
byte[] metadata = IcecastMetadata.formatInline(IcecastMetadata.getTitle(identifierCollection, mAliasModel)).getBytes();
|
|
||||||
if (mInlineRemaining == -1)
|
if (mInlineRemaining == -1)
|
||||||
{
|
{
|
||||||
mInlineRemaining = mInlineInterval;
|
mInlineRemaining = mInlineInterval;
|
||||||
@@ -96,16 +104,34 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
byte[] chunk = Arrays.copyOfRange(audio, audioOffset, Math.min(audioOffset + mInlineRemaining, audio.length));
|
byte[] chunk = Arrays.copyOfRange(audio, audioOffset, Math.min(audioOffset + mInlineRemaining, audio.length));
|
||||||
mInlineRemaining -= chunk.length;
|
mInlineRemaining -= chunk.length;
|
||||||
audioOffset += chunk.length;
|
audioOffset += chunk.length;
|
||||||
|
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Broadcasting audio data - sending [" + chunk.length + "/" + audio.length + "] bytes");
|
||||||
|
}
|
||||||
|
|
||||||
mStreamingSession.write(chunk);
|
mStreamingSession.write(chunk);
|
||||||
if(mInlineRemaining == 0)
|
if(mInlineRemaining == 0)
|
||||||
{
|
{
|
||||||
mInlineRemaining = mInlineInterval;
|
mInlineRemaining = mInlineInterval;
|
||||||
|
|
||||||
|
byte[] metadata = IcecastMetadata.formatInline(IcecastMetadata.getTitle(identifierCollection, mAliasModel)).getBytes();
|
||||||
|
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Sending inline metadata: " + new String(metadata));
|
||||||
|
}
|
||||||
|
|
||||||
mStreamingSession.write(metadata);
|
mStreamingSession.write(metadata);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Broadcasting audio data [" + audio.length + "] bytes");
|
||||||
|
}
|
||||||
mStreamingSession.write(audio);
|
mStreamingSession.write(audio);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -132,9 +158,12 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
mSocketConnector = new NioSocketConnector();
|
mSocketConnector = new NioSocketConnector();
|
||||||
mSocketConnector.getSessionConfig().setWriteTimeout(WRITE_TIMEOUT_SECONDS);
|
mSocketConnector.getSessionConfig().setWriteTimeout(WRITE_TIMEOUT_SECONDS);
|
||||||
|
|
||||||
// LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
|
if(mVerboseLogging)
|
||||||
// loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
|
{
|
||||||
// mSocketConnector.getFilterChain().addLast("logger", loggingFilter);
|
LoggingFilter loggingFilter = new LoggingFilter(IcecastTCPAudioBroadcaster.class);
|
||||||
|
loggingFilter.setMessageSentLogLevel(LogLevel.NONE);
|
||||||
|
mSocketConnector.getFilterChain().addLast("logger", loggingFilter);
|
||||||
|
}
|
||||||
|
|
||||||
mSocketConnector.getFilterChain().addLast("codec",
|
mSocketConnector.getFilterChain().addLast("codec",
|
||||||
new ProtocolCodecFilter(new IcecastCodecFactory()));
|
new ProtocolCodecFilter(new IcecastCodecFactory()));
|
||||||
@@ -148,6 +177,10 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
@Override
|
@Override
|
||||||
public void run()
|
public void run()
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Attempting connection ...");
|
||||||
|
}
|
||||||
setBroadcastState(BroadcastState.CONNECTING);
|
setBroadcastState(BroadcastState.CONNECTING);
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -156,19 +189,42 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
.connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
|
.connect(new InetSocketAddress(getBroadcastConfiguration().getHost(),
|
||||||
getBroadcastConfiguration().getPort()));
|
getBroadcastConfiguration().getPort()));
|
||||||
|
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Socket created - asynchronous connect requested - entering wait period");
|
||||||
|
}
|
||||||
|
|
||||||
boolean connected = future.await(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
|
boolean connected = future.await(CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS, TimeUnit.MILLISECONDS);
|
||||||
|
|
||||||
if(connected)
|
if(connected)
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Connected.");
|
||||||
|
}
|
||||||
|
|
||||||
mStreamingSession = future.getSession();
|
mStreamingSession = future.getSession();
|
||||||
mConnecting.set(false);
|
mConnecting.set(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Not Connected. Connection attempt timeout [" + CONNECTION_ATTEMPT_TIMEOUT_MILLISECONDS + "ms] exceeded");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch(RuntimeIoException rioe)
|
catch(RuntimeIoException rioe)
|
||||||
{
|
{
|
||||||
if(rioe.getCause() instanceof SocketException)
|
if(rioe.getCause() instanceof SocketException)
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Socket error. This usually indicates sdrtrunk can't reach the server " +
|
||||||
|
"address over the current network connection. Setting state to " +
|
||||||
|
"NETWORK UNAVAILABLE", rioe);
|
||||||
|
}
|
||||||
setBroadcastState(BroadcastState.NETWORK_UNAVAILABLE);
|
setBroadcastState(BroadcastState.NETWORK_UNAVAILABLE);
|
||||||
mConnecting.set(false);
|
mConnecting.set(false);
|
||||||
return;
|
return;
|
||||||
@@ -176,12 +232,22 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
}
|
}
|
||||||
catch(UnresolvedAddressException uae)
|
catch(UnresolvedAddressException uae)
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Unresolved Address error. This means the domain name services can't resolve " +
|
||||||
|
"the server URL to an IP address. Setting state to NETWORK UNAVAILABLE", uae);
|
||||||
|
}
|
||||||
|
|
||||||
setBroadcastState(BroadcastState.NETWORK_UNAVAILABLE);
|
setBroadcastState(BroadcastState.NETWORK_UNAVAILABLE);
|
||||||
mConnecting.set(false);
|
mConnecting.set(false);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Unknown error. An error occurred while attempting to connect to the server.", e);
|
||||||
|
}
|
||||||
mLog.error("Error", e);
|
mLog.error("Error", e);
|
||||||
//Disregard ... we'll disconnect and try again
|
//Disregard ... we'll disconnect and try again
|
||||||
}
|
}
|
||||||
@@ -190,6 +256,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
mLog.error("Throwable error caught", t);
|
mLog.error("Throwable error caught", t);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Starting disconnect sequence since an error occurred while trying to connect.");
|
||||||
|
}
|
||||||
|
|
||||||
disconnect();
|
disconnect();
|
||||||
mConnecting.set(false);
|
mConnecting.set(false);
|
||||||
}
|
}
|
||||||
@@ -209,6 +280,11 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
{
|
{
|
||||||
if(connected() && mStreamingSession != null)
|
if(connected() && mStreamingSession != null)
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Routine disconnect requested from a connected state with a non-null streaming session");
|
||||||
|
}
|
||||||
|
|
||||||
mStreamingSession.closeNow();
|
mStreamingSession.closeNow();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -217,6 +293,12 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
//want to preserve the error state that got us here, so the user can see it.
|
//want to preserve the error state that got us here, so the user can see it.
|
||||||
if(!getBroadcastState().isErrorState())
|
if(!getBroadcastState().isErrorState())
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Disconnect requested - previous non-error state was [" + getBroadcastState() +
|
||||||
|
"] - changing state to DISCONNECTED");
|
||||||
|
}
|
||||||
|
|
||||||
setBroadcastState(BroadcastState.DISCONNECTED);
|
setBroadcastState(BroadcastState.DISCONNECTED);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,12 +364,23 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
mInlineActive = false;
|
mInlineActive = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Session opened. Sending: " + sb);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
session.write(sb.toString());
|
session.write(sb.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void sessionClosed(IoSession session) throws Exception
|
public void sessionClosed(IoSession session) throws Exception
|
||||||
{
|
{
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Session closed. Setting connecting flag to false.");
|
||||||
|
}
|
||||||
|
|
||||||
mLastConnectionAttempt = System.currentTimeMillis();
|
mLastConnectionAttempt = System.currentTimeMillis();
|
||||||
|
|
||||||
//If there is already an error state, don't override it. Otherwise, set state to disconnected
|
//If there is already an error state, don't override it. Otherwise, set state to disconnected
|
||||||
@@ -311,15 +404,23 @@ public class IcecastTCPAudioBroadcaster extends IcecastAudioBroadcaster
|
|||||||
mLog.error("[" + getStreamName() + "] Broadcast error", cause);
|
mLog.error("[" + getStreamName() + "] Broadcast error", cause);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Session error caught.", cause);
|
||||||
|
}
|
||||||
|
|
||||||
disconnect();
|
disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void messageReceived(IoSession session, Object object) throws Exception
|
public void messageReceived(IoSession session, Object object) throws Exception
|
||||||
{
|
{
|
||||||
if(object instanceof String)
|
if(object instanceof String message)
|
||||||
{
|
{
|
||||||
String message = (String) object;
|
if(mVerboseLogging)
|
||||||
|
{
|
||||||
|
mLog.info("Message Received [" + message + "]");
|
||||||
|
}
|
||||||
|
|
||||||
if(message != null && !message.trim().isEmpty())
|
if(message != null && !message.trim().isEmpty())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2022 Dennis Sheirer
|
* Copyright (C) 2014-2025 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,55 +19,45 @@
|
|||||||
|
|
||||||
package io.github.dsheirer.audio.broadcast.openmhz;
|
package io.github.dsheirer.audio.broadcast.openmhz;
|
||||||
|
|
||||||
import com.google.common.net.HttpHeaders;
|
import com.google.common.net.HttpHeaders;
|
||||||
import com.google.common.base.Joiner;
|
import io.github.dsheirer.alias.Alias;
|
||||||
import io.github.dsheirer.alias.Alias;
|
import io.github.dsheirer.alias.AliasList;
|
||||||
import io.github.dsheirer.alias.AliasList;
|
import io.github.dsheirer.alias.AliasModel;
|
||||||
import io.github.dsheirer.alias.AliasModel;
|
import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
|
||||||
import io.github.dsheirer.audio.broadcast.AbstractAudioBroadcaster;
|
import io.github.dsheirer.audio.broadcast.AudioRecording;
|
||||||
import io.github.dsheirer.audio.broadcast.AudioRecording;
|
import io.github.dsheirer.audio.broadcast.BroadcastEvent;
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastEvent;
|
import io.github.dsheirer.audio.broadcast.BroadcastState;
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastState;
|
import io.github.dsheirer.audio.convert.InputAudioFormat;
|
||||||
import io.github.dsheirer.audio.convert.InputAudioFormat;
|
import io.github.dsheirer.audio.convert.MP3Setting;
|
||||||
import io.github.dsheirer.audio.convert.MP3Setting;
|
import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceDecoder;
|
||||||
import io.github.dsheirer.gui.playlist.radioreference.RadioReferenceDecoder;
|
import io.github.dsheirer.identifier.Form;
|
||||||
import io.github.dsheirer.identifier.Form;
|
import io.github.dsheirer.identifier.Identifier;
|
||||||
import io.github.dsheirer.identifier.Identifier;
|
import io.github.dsheirer.identifier.IdentifierClass;
|
||||||
import io.github.dsheirer.identifier.IdentifierClass;
|
import io.github.dsheirer.identifier.Role;
|
||||||
import io.github.dsheirer.identifier.MutableIdentifierCollection;
|
import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
|
||||||
import io.github.dsheirer.identifier.Role;
|
import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
|
||||||
import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
|
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.talkgroup.TalkgroupIdentifier;
|
||||||
import io.github.dsheirer.identifier.talkgroup.TalkgroupIdentifier;
|
import io.github.dsheirer.util.ThreadPool;
|
||||||
import io.github.dsheirer.util.ThreadPool;
|
import java.io.IOException;
|
||||||
import org.slf4j.Logger;
|
import java.net.ConnectException;
|
||||||
import org.slf4j.LoggerFactory;
|
import java.net.URI;
|
||||||
|
import java.net.http.HttpClient;
|
||||||
import java.io.File;
|
import java.net.http.HttpRequest;
|
||||||
import java.nio.file.Files;
|
import java.net.http.HttpResponse;
|
||||||
import java.io.FileInputStream;
|
import java.nio.file.Files;
|
||||||
import java.io.FileNotFoundException;
|
import java.time.Duration;
|
||||||
import java.io.IOException;
|
import java.util.List;
|
||||||
import java.io.PrintWriter;
|
import java.util.Optional;
|
||||||
import java.io.BufferedReader;
|
import java.util.Queue;
|
||||||
import java.io.InputStreamReader;
|
import java.util.concurrent.CompletionException;
|
||||||
import java.io.OutputStreamWriter;
|
import java.util.concurrent.LinkedTransferQueue;
|
||||||
import java.net.ConnectException;
|
import java.util.concurrent.ScheduledFuture;
|
||||||
import java.net.URI;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.net.URL;
|
import org.slf4j.Logger;
|
||||||
import java.net.URLConnection;
|
import org.slf4j.LoggerFactory;
|
||||||
import java.net.http.HttpClient;
|
|
||||||
import java.net.http.HttpRequest;
|
|
||||||
import java.net.http.HttpResponse;
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Queue;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.LinkedTransferQueue;
|
|
||||||
import java.util.concurrent.ScheduledFuture;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -249,6 +239,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 +273,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()
|
||||||
@@ -426,22 +417,40 @@
|
|||||||
* Creates a formatted string with the TO identifiers or uses a default of zero (0)
|
* Creates a formatted string with the TO identifiers or uses a default of zero (0)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private static String getTo(AudioRecording audioRecording)
|
private String getTo(AudioRecording audioRecording)
|
||||||
{
|
{
|
||||||
Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
|
Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
|
||||||
|
|
||||||
if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
|
if(identifier != null)
|
||||||
{
|
{
|
||||||
return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
|
AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
|
||||||
}
|
|
||||||
else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
|
if(aliasList != null)
|
||||||
{
|
{
|
||||||
return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
|
List<Alias> aliases = aliasList.getAliases(identifier);
|
||||||
talkgroupIdentifier.getProtocol()));
|
|
||||||
}
|
//Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
|
||||||
else if(identifier instanceof RadioIdentifier radioIdentifier)
|
Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
|
||||||
{
|
|
||||||
return radioIdentifier.getValue().toString();
|
if(streamAs.isPresent())
|
||||||
|
{
|
||||||
|
return String.valueOf(streamAs.get().getStreamTalkgroupAlias().getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
|
||||||
|
{
|
||||||
|
return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
|
||||||
|
}
|
||||||
|
else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
|
||||||
|
{
|
||||||
|
return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
|
||||||
|
talkgroupIdentifier.getProtocol()));
|
||||||
|
}
|
||||||
|
else if(identifier instanceof RadioIdentifier radioIdentifier)
|
||||||
|
{
|
||||||
|
return radioIdentifier.getValue().toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return "0";
|
return "0";
|
||||||
@@ -547,6 +556,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
|
||||||
|
|||||||
@@ -17,13 +17,14 @@
|
|||||||
* ****************************************************************************
|
* ****************************************************************************
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package io.github.dsheirer.gui.playlist.streaming;
|
package io.github.dsheirer.audio.broadcast.openmhz;
|
||||||
|
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastServerType;
|
import io.github.dsheirer.audio.broadcast.BroadcastServerType;
|
||||||
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
|
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzBroadcaster;
|
||||||
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
|
import io.github.dsheirer.audio.broadcast.openmhz.OpenMHzConfiguration;
|
||||||
import io.github.dsheirer.gui.control.IntegerTextField;
|
import io.github.dsheirer.gui.control.IntegerTextField;
|
||||||
import io.github.dsheirer.playlist.PlaylistManager;
|
import io.github.dsheirer.gui.playlist.streaming.AbstractBroadcastEditor;
|
||||||
|
import io.github.dsheirer.playlist.PlaylistManager;
|
||||||
import javafx.geometry.HPos;
|
import javafx.geometry.HPos;
|
||||||
import javafx.geometry.Insets;
|
import javafx.geometry.Insets;
|
||||||
import javafx.scene.control.Alert;
|
import javafx.scene.control.Alert;
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ public enum FormField
|
|||||||
SOURCES("sources"),
|
SOURCES("sources"),
|
||||||
SYSTEM("system"),
|
SYSTEM("system"),
|
||||||
SYSTEM_LABEL("systemLabel"),
|
SYSTEM_LABEL("systemLabel"),
|
||||||
|
TALKER_ALIAS("talkerAlias"),
|
||||||
TALKGROUP_ID("talkgroup"),
|
TALKGROUP_ID("talkgroup"),
|
||||||
TALKGROUP_GROUP("talkgroupGroup"),
|
TALKGROUP_GROUP("talkgroupGroup"),
|
||||||
TALKGROUP_LABEL("talkgroupLabel"),
|
TALKGROUP_LABEL("talkgroupLabel"),
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2025 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
|
||||||
@@ -34,6 +34,7 @@ import io.github.dsheirer.identifier.Form;
|
|||||||
import io.github.dsheirer.identifier.Identifier;
|
import io.github.dsheirer.identifier.Identifier;
|
||||||
import io.github.dsheirer.identifier.IdentifierClass;
|
import io.github.dsheirer.identifier.IdentifierClass;
|
||||||
import io.github.dsheirer.identifier.Role;
|
import io.github.dsheirer.identifier.Role;
|
||||||
|
import io.github.dsheirer.identifier.alias.TalkerAliasIdentifier;
|
||||||
import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
|
import io.github.dsheirer.identifier.configuration.ConfigurationLongIdentifier;
|
||||||
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;
|
||||||
@@ -48,6 +49,7 @@ import java.net.http.HttpResponse;
|
|||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
import java.util.concurrent.CompletionException;
|
import java.util.concurrent.CompletionException;
|
||||||
import java.util.concurrent.LinkedTransferQueue;
|
import java.util.concurrent.LinkedTransferQueue;
|
||||||
@@ -111,7 +113,8 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mLog.error("Error connecting to Rdio Scanner server on startup [" + response + "]");
|
mLog.error("Error connecting to " + getBroadcastConfiguration().getServiceName() +
|
||||||
|
" server on startup [" + response + "]");
|
||||||
setBroadcastState(BroadcastState.ERROR);
|
setBroadcastState(BroadcastState.ERROR);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -227,6 +230,7 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
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);
|
||||||
@@ -246,7 +250,8 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
}
|
}
|
||||||
catch(IOException e)
|
catch(IOException e)
|
||||||
{
|
{
|
||||||
mLog.error("Rdio Scanner API - audio recording file not found - ignoring upload");
|
mLog.error(getBroadcastConfiguration().getServiceName() +
|
||||||
|
" API - audio recording file not found - ignoring upload");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(audioBytes != null)
|
if(audioBytes != null)
|
||||||
@@ -261,6 +266,7 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
.addPart(FormField.TALKGROUP_ID, talkgroup)
|
.addPart(FormField.TALKGROUP_ID, talkgroup)
|
||||||
.addPart(FormField.SOURCE, radioId)
|
.addPart(FormField.SOURCE, radioId)
|
||||||
.addPart(FormField.FREQUENCY, frequency)
|
.addPart(FormField.FREQUENCY, frequency)
|
||||||
|
.addPart(FormField.TALKER_ALIAS, talkerAlias)
|
||||||
.addPart(FormField.TALKGROUP_LABEL, talkgroupLabel)
|
.addPart(FormField.TALKGROUP_LABEL, talkgroupLabel)
|
||||||
.addPart(FormField.TALKGROUP_GROUP, talkgroupGroup)
|
.addPart(FormField.TALKGROUP_GROUP, talkgroupGroup)
|
||||||
.addPart(FormField.SYSTEM_LABEL, systemLabel)
|
.addPart(FormField.SYSTEM_LABEL, systemLabel)
|
||||||
@@ -282,14 +288,14 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
//We get socket reset exceptions occasionally when the remote server doesn't
|
//We get socket reset exceptions occasionally when the remote server doesn't
|
||||||
//fully read our request and immediately responds.
|
//fully read our request and immediately responds.
|
||||||
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
|
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
|
||||||
mLog.error("Rdio Scanner API file upload fail [" +
|
mLog.error(getBroadcastConfiguration().getServiceName() + " API file upload fail [" +
|
||||||
fileResponse.statusCode() + "] response [" +
|
fileResponse.statusCode() + "] response [" +
|
||||||
fileResponse.body() + "]");
|
fileResponse.body() + "]");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
|
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
|
||||||
mLog.error("Rdio Scanner API file upload fail [" +
|
mLog.error(getBroadcastConfiguration().getServiceName() + " API file upload fail [" +
|
||||||
fileResponse.statusCode() + "] response [" +
|
fileResponse.statusCode() + "] response [" +
|
||||||
fileResponse.body() + "]");
|
fileResponse.body() + "]");
|
||||||
}
|
}
|
||||||
@@ -317,7 +323,7 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
|
setBroadcastState(BroadcastState.TEMPORARY_BROADCAST_ERROR);
|
||||||
mLog.error("Rdio Scanner API file upload fail [" +
|
mLog.error(getBroadcastConfiguration().getServiceName() + " API file upload fail [" +
|
||||||
fileResponse.statusCode() + "] response [" +
|
fileResponse.statusCode() + "] response [" +
|
||||||
fileResponse.body() + "]");
|
fileResponse.body() + "]");
|
||||||
}
|
}
|
||||||
@@ -330,7 +336,7 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
//Register an error for the file not found exception
|
//Register an error for the file not found exception
|
||||||
mLog.error("Rdio Scanner API - upload file not found [" +
|
mLog.error(getBroadcastConfiguration().getServiceName() + " API - upload file not found [" +
|
||||||
audioRecording.getPath().toString() + "]");
|
audioRecording.getPath().toString() + "]");
|
||||||
incrementErrorAudioCount();
|
incrementErrorAudioCount();
|
||||||
broadcast(new BroadcastEvent(RdioScannerBroadcaster.this,
|
broadcast(new BroadcastEvent(RdioScannerBroadcaster.this,
|
||||||
@@ -408,26 +414,62 @@ public class RdioScannerBroadcaster extends AbstractAudioBroadcaster<RdioScanner
|
|||||||
return "0";
|
return "0";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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 "";
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a formatted string with the TO identifiers or uses a default of zero (0)
|
* Creates a formatted string with the TO identifiers or uses a default of zero (0)
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private static String getTo(AudioRecording audioRecording)
|
private String getTo(AudioRecording audioRecording)
|
||||||
{
|
{
|
||||||
Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
|
Identifier identifier = audioRecording.getIdentifierCollection().getToIdentifier();
|
||||||
|
|
||||||
if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
|
if(identifier != null)
|
||||||
{
|
{
|
||||||
return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
|
AliasList aliasList = mAliasModel.getAliasList(audioRecording.getIdentifierCollection());
|
||||||
}
|
|
||||||
else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
|
if(aliasList != null)
|
||||||
{
|
{
|
||||||
return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
|
List<Alias> aliases = aliasList.getAliases(identifier);
|
||||||
talkgroupIdentifier.getProtocol()));
|
|
||||||
}
|
//Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
|
||||||
else if(identifier instanceof RadioIdentifier radioIdentifier)
|
Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
|
||||||
{
|
|
||||||
return radioIdentifier.getValue().toString();
|
if(streamAs.isPresent())
|
||||||
|
{
|
||||||
|
return String.valueOf(streamAs.get().getStreamTalkgroupAlias().getValue());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(identifier instanceof PatchGroupIdentifier patchGroupIdentifier)
|
||||||
|
{
|
||||||
|
return patchGroupIdentifier.getValue().getPatchGroup().getValue().toString();
|
||||||
|
}
|
||||||
|
else if(identifier instanceof TalkgroupIdentifier talkgroupIdentifier)
|
||||||
|
{
|
||||||
|
return String.valueOf(RadioReferenceDecoder.convertToRadioReferenceTalkgroup(talkgroupIdentifier.getValue(),
|
||||||
|
talkgroupIdentifier.getProtocol()));
|
||||||
|
}
|
||||||
|
else if(identifier instanceof RadioIdentifier radioIdentifier)
|
||||||
|
{
|
||||||
|
return radioIdentifier.getValue().toString();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return "0";
|
return "0";
|
||||||
|
|||||||
@@ -19,6 +19,7 @@
|
|||||||
|
|
||||||
package io.github.dsheirer.audio.broadcast.rdioscanner;
|
package io.github.dsheirer.audio.broadcast.rdioscanner;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
|
import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
|
||||||
import io.github.dsheirer.audio.broadcast.BroadcastFormat;
|
import io.github.dsheirer.audio.broadcast.BroadcastFormat;
|
||||||
@@ -125,6 +126,15 @@ public class RdioScannerConfiguration extends BroadcastConfiguration
|
|||||||
return BroadcastServerType.RDIOSCANNER_CALL;
|
return BroadcastServerType.RDIOSCANNER_CALL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Product name written to connection and upload logs.
|
||||||
|
*/
|
||||||
|
@JsonIgnore
|
||||||
|
public String getServiceName()
|
||||||
|
{
|
||||||
|
return "Rdio Scanner";
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BroadcastConfiguration copyOf()
|
public BroadcastConfiguration copyOf()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2022 Dennis Sheirer
|
* Copyright (C) 2014-2025 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
|
||||||
@@ -29,6 +29,17 @@ import io.github.dsheirer.identifier.IdentifierClass;
|
|||||||
import io.github.dsheirer.identifier.IdentifierCollection;
|
import io.github.dsheirer.identifier.IdentifierCollection;
|
||||||
import io.github.dsheirer.identifier.Role;
|
import io.github.dsheirer.identifier.Role;
|
||||||
import io.github.dsheirer.util.ThreadPool;
|
import io.github.dsheirer.util.ThreadPool;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.ConnectException;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.net.URLEncoder;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.Queue;
|
||||||
|
import java.util.concurrent.LinkedTransferQueue;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
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;
|
||||||
import org.apache.mina.core.session.IoSession;
|
import org.apache.mina.core.session.IoSession;
|
||||||
@@ -41,17 +52,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.net.ConnectException;
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.net.URLEncoder;
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Queue;
|
|
||||||
import java.util.concurrent.LinkedTransferQueue;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUpdater
|
public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUpdater
|
||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV1BroadcastMetadataUpdater.class);
|
private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV1BroadcastMetadataUpdater.class);
|
||||||
@@ -212,10 +212,20 @@ public class ShoutcastV1BroadcastMetadataUpdater implements IBroadcastMetadataUp
|
|||||||
|
|
||||||
if(to != null)
|
if(to != null)
|
||||||
{
|
{
|
||||||
sb.append("TO:").append(to);
|
|
||||||
|
|
||||||
List<Alias> aliases = aliasList.getAliases(to);
|
List<Alias> aliases = aliasList.getAliases(to);
|
||||||
|
|
||||||
|
//Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
|
||||||
|
Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
|
||||||
|
|
||||||
|
if(streamAs.isPresent())
|
||||||
|
{
|
||||||
|
sb.append("TO:").append(streamAs.get().getStreamTalkgroupAlias().getValue());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sb.append("TO:").append(to);
|
||||||
|
}
|
||||||
|
|
||||||
if(!aliases.isEmpty())
|
if(!aliases.isEmpty())
|
||||||
{
|
{
|
||||||
sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
|
sb.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2022 Dennis Sheirer
|
* Copyright (C) 2014-2025 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
|
||||||
@@ -49,6 +49,15 @@ import io.github.dsheirer.identifier.IdentifierCollection;
|
|||||||
import io.github.dsheirer.identifier.Role;
|
import io.github.dsheirer.identifier.Role;
|
||||||
import io.github.dsheirer.properties.SystemProperties;
|
import io.github.dsheirer.properties.SystemProperties;
|
||||||
import io.github.dsheirer.util.ThreadPool;
|
import io.github.dsheirer.util.ThreadPool;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.UnsupportedEncodingException;
|
||||||
|
import java.net.ConnectException;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Optional;
|
||||||
|
import java.util.concurrent.LinkedTransferQueue;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import org.apache.commons.math3.util.FastMath;
|
import org.apache.commons.math3.util.FastMath;
|
||||||
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;
|
||||||
@@ -59,15 +68,6 @@ import org.apache.mina.transport.socket.nio.NioSocketConnector;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.UnsupportedEncodingException;
|
|
||||||
import java.net.ConnectException;
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.LinkedTransferQueue;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
|
|
||||||
public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcaster implements IBroadcastMetadataUpdater
|
public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcaster implements IBroadcastMetadataUpdater
|
||||||
{
|
{
|
||||||
private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV2AudioStreamingBroadcaster.class);
|
private final static Logger mLog = LoggerFactory.getLogger(ShoutcastV2AudioStreamingBroadcaster.class);
|
||||||
@@ -303,13 +303,23 @@ public class ShoutcastV2AudioStreamingBroadcaster extends AudioStreamingBroadcas
|
|||||||
|
|
||||||
if(to != null)
|
if(to != null)
|
||||||
{
|
{
|
||||||
sbTitle2.append("TO:").append(to);
|
|
||||||
|
|
||||||
List<Alias> aliases = aliasList.getAliases(to);
|
List<Alias> aliases = aliasList.getAliases(to);
|
||||||
|
|
||||||
if(!aliases.isEmpty())
|
//Check for 'Stream As Talkgroup' alias and use this instead of the decoded TO value.
|
||||||
|
Optional<Alias> streamAs = aliases.stream().filter(alias -> alias.getStreamTalkgroupAlias() != null).findFirst();
|
||||||
|
|
||||||
|
if(streamAs.isPresent())
|
||||||
{
|
{
|
||||||
sbTitle2.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
|
sbTitle2.append("TO:").append(streamAs.get().getStreamTalkgroupAlias().getValue());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sbTitle2.append("TO:").append(to);
|
||||||
|
|
||||||
|
if(!aliases.isEmpty())
|
||||||
|
{
|
||||||
|
sbTitle2.append(" ").append(Joiner.on(", ").skipNulls().join(aliases));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -0,0 +1,75 @@
|
|||||||
|
/*
|
||||||
|
* *****************************************************************************
|
||||||
|
* Copyright (C) 2014-2026 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 io.github.dsheirer.audio.broadcast.thinline;
|
||||||
|
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
|
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
|
||||||
|
import io.github.dsheirer.audio.broadcast.BroadcastConfiguration;
|
||||||
|
import io.github.dsheirer.audio.broadcast.BroadcastFormat;
|
||||||
|
import io.github.dsheirer.audio.broadcast.BroadcastServerType;
|
||||||
|
import io.github.dsheirer.audio.broadcast.rdioscanner.RdioScannerConfiguration;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Call upload configuration for Thinline Radio.
|
||||||
|
*
|
||||||
|
* Thinline Radio accepts the same completed-call upload used by Rdio Scanner, including the system id, API key,
|
||||||
|
* and /api/call-upload path.
|
||||||
|
*/
|
||||||
|
public class ThinlineRadioConfiguration extends RdioScannerConfiguration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Constructor for Jackson
|
||||||
|
*/
|
||||||
|
public ThinlineRadioConfiguration()
|
||||||
|
{
|
||||||
|
this(BroadcastFormat.MP3);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Public constructor.
|
||||||
|
* @param format to use for audio recording (MP3)
|
||||||
|
*/
|
||||||
|
public ThinlineRadioConfiguration(BroadcastFormat format)
|
||||||
|
{
|
||||||
|
super(format);
|
||||||
|
}
|
||||||
|
|
||||||
|
@JacksonXmlProperty(isAttribute = true, localName = "type", namespace = "http://www.w3.org/2001/XMLSchema-instance")
|
||||||
|
@Override
|
||||||
|
public BroadcastServerType getBroadcastServerType()
|
||||||
|
{
|
||||||
|
return BroadcastServerType.THINLINE_RADIO;
|
||||||
|
}
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
|
@Override
|
||||||
|
public String getServiceName()
|
||||||
|
{
|
||||||
|
return "Thinline Radio";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BroadcastConfiguration copyOf()
|
||||||
|
{
|
||||||
|
ThinlineRadioConfiguration copy = new ThinlineRadioConfiguration();
|
||||||
|
copy.setSystemID(getSystemID());
|
||||||
|
return copy;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -41,11 +41,11 @@ public abstract class AmbeAudioModule extends JmbeAudioModule
|
|||||||
{
|
{
|
||||||
if(getAudioCodec() != null)
|
if(getAudioCodec() != null)
|
||||||
{
|
{
|
||||||
mLog.info("AMBE CODEC successfully loaded - P25-2/DMR/NXDN audio will be available");
|
mLog.info("AMBE CODEC successfully loaded - P25-2/DMR/NXDN audio can be processed");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mLog.warn("AMBE CODEC not loaded - P25-2/DMR/NXDN audio will NOT be available");
|
mLog.warn("AMBE CODEC not loaded - P25-2/DMR/NXDN audio will NOT be processed");
|
||||||
}
|
}
|
||||||
|
|
||||||
sLibraryStatusLogged = true;
|
sLibraryStatusLogged = true;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2023 Dennis Sheirer
|
* Copyright (C) 2014-2024 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
|
||||||
@@ -35,16 +35,22 @@ import java.net.URL;
|
|||||||
import java.net.URLClassLoader;
|
import java.net.URLClassLoader;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import jmbe.iface.IAudioCodec;
|
import jmbe.iface.IAudioCodec;
|
||||||
import jmbe.iface.IAudioCodecLibrary;
|
import jmbe.iface.IAudioCodecLibrary;
|
||||||
|
import jmbe.iface.IAudioCodecLibraryV2;
|
||||||
|
import jmbe.iface.IAudioCodecV2;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Base audio module for protocols that use the JMBE audio codec.
|
||||||
|
*/
|
||||||
public abstract class JmbeAudioModule extends AbstractAudioModule implements Listener<IMessage>, IMessageListener,
|
public abstract class JmbeAudioModule extends AbstractAudioModule implements Listener<IMessage>, IMessageListener,
|
||||||
ISquelchStateListener
|
ISquelchStateListener
|
||||||
{
|
{
|
||||||
private static final Logger mLog = LoggerFactory.getLogger(JmbeAudioModule.class);
|
private static final Logger LOG = LoggerFactory.getLogger(JmbeAudioModule.class);
|
||||||
private static final String JMBE_AUDIO_LIBRARY = "JMBE";
|
private static final String JMBE_AUDIO_LIBRARY = "JMBE";
|
||||||
private static final List<String> mLibraryLoadStatusLogged = new ArrayList<>();
|
private static final List<String> mLibraryLoadStatusLogged = new ArrayList<>();
|
||||||
private IAudioCodec mAudioCodec;
|
private IAudioCodec mAudioCodec;
|
||||||
@@ -53,18 +59,60 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
|
|
||||||
public JmbeAudioModule(UserPreferences userPreferences, AliasList aliasList, int timeslot)
|
public JmbeAudioModule(UserPreferences userPreferences, AliasList aliasList, int timeslot)
|
||||||
{
|
{
|
||||||
super(aliasList, timeslot, DEFAULT_SEGMENT_AUDIO_SAMPLE_LENGTH);
|
super(aliasList, timeslot, DEFAULT_MAX_SEGMENT_LENGTH_MILLIS);
|
||||||
mUserPreferences = userPreferences;
|
mUserPreferences = userPreferences;
|
||||||
MyEventBus.getGlobalEventBus().register(this);
|
MyEventBus.getGlobalEventBus().register(this);
|
||||||
loadConverter();
|
loadConverter();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* List of features supported by the JMBE audio library. Note: features are only supported in Version 2.0+
|
||||||
|
* @return list of features or an empty list if the current library version doesn't support features.
|
||||||
|
*/
|
||||||
|
public List<String> getFeatures()
|
||||||
|
{
|
||||||
|
if(mAudioCodec instanceof IAudioCodecV2 v2)
|
||||||
|
{
|
||||||
|
return v2.getFeatures();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Collections.emptyList();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets the JMBE feature
|
||||||
|
* @param name of the feature
|
||||||
|
* @param value for the feature
|
||||||
|
*/
|
||||||
|
public void setFeature(String name, Object value)
|
||||||
|
{
|
||||||
|
if(mAudioCodec instanceof IAudioCodecV2 v2)
|
||||||
|
{
|
||||||
|
v2.setFeature(name, value);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
LOG.info("Feature [" + name + "] is not supported by the current JMBE audio codec library version");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void closeAudioSegment()
|
||||||
|
{
|
||||||
|
super.closeAudioSegment();
|
||||||
|
|
||||||
|
//Reset the audio codec to clear any leftover frame data from the previous call.
|
||||||
|
if(mAudioCodec != null)
|
||||||
|
{
|
||||||
|
mAudioCodec.reset();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void dispose()
|
public void dispose()
|
||||||
{
|
{
|
||||||
super.dispose();
|
super.dispose();
|
||||||
MyEventBus.getGlobalEventBus().unregister(this);
|
MyEventBus.getGlobalEventBus().unregister(this);
|
||||||
mAudioCodec = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public IAudioCodec getAudioCodec()
|
public IAudioCodec getAudioCodec()
|
||||||
@@ -121,7 +169,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.info("Loading JMBE library from [" + path + "]");
|
LOG.info("Loading JMBE library from [" + path + "]");
|
||||||
}
|
}
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -129,13 +177,32 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
URLClassLoader childClassLoader = new URLClassLoader(new URL[]{path.toUri().toURL()},
|
URLClassLoader childClassLoader = new URLClassLoader(new URL[]{path.toUri().toURL()},
|
||||||
this.getClass().getClassLoader());
|
this.getClass().getClassLoader());
|
||||||
|
|
||||||
sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibrary", true, childClassLoader);
|
try
|
||||||
|
{
|
||||||
|
sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibraryV2", true, childClassLoader);
|
||||||
|
}
|
||||||
|
catch(ClassNotFoundException legacyLibrary)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
sLoadedJmbeAudioConverterClass = Class.forName("jmbe.JMBEAudioLibrary", true, childClassLoader);
|
||||||
|
}
|
||||||
|
catch(ClassNotFoundException missingLibrary)
|
||||||
|
{
|
||||||
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
|
{
|
||||||
|
LOG.error("Couldn't load JMBE audio conversion library from [" + path +
|
||||||
|
"] - neither V2 nor V1 library class was found");
|
||||||
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch(IllegalArgumentException iae)
|
catch(IllegalArgumentException iae)
|
||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY + getCodecName()))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY + getCodecName()))
|
||||||
{
|
{
|
||||||
mLog.error("Couldn't load JMBE audio conversion library - " + iae.getMessage());
|
LOG.error("Couldn't load JMBE audio conversion library - " + iae.getMessage());
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY + getCodecName());
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY + getCodecName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -143,18 +210,11 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.error("Couldn't load JMBE audio conversion library from path [" + path + "]");
|
LOG.error("Couldn't load JMBE audio conversion library from path [" + path + "]");
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch(ClassNotFoundException e1)
|
|
||||||
{
|
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
|
||||||
{
|
|
||||||
mLog.error("Couldn't load JMBE audio conversion library - class not found");
|
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -169,11 +229,23 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
if((library.getMajorVersion() == 1 && library.getMinorVersion() >= 0 &&
|
if((library.getMajorVersion() == 1 && library.getMinorVersion() >= 0 &&
|
||||||
library.getBuildVersion() >= 0) || library.getMajorVersion() >= 1)
|
library.getBuildVersion() >= 0) || library.getMajorVersion() >= 1)
|
||||||
{
|
{
|
||||||
audioConverter = library.getAudioConverter(getCodecName());
|
audioConverter = library instanceof IAudioCodecLibraryV2 libraryV2 ?
|
||||||
|
libraryV2.getAudioConverterV2(getCodecName()) :
|
||||||
|
library.getAudioConverter(getCodecName());
|
||||||
|
|
||||||
|
String codecStatusKey = JMBE_AUDIO_LIBRARY + ":codec:" + getCodecName();
|
||||||
|
if(!mLibraryLoadStatusLogged.contains(codecStatusKey))
|
||||||
|
{
|
||||||
|
LOG.info("JMBE codec [" + getCodecName() + "] class [" +
|
||||||
|
audioConverter.getClass().getName() + "] features [" +
|
||||||
|
(audioConverter instanceof IAudioCodecV2 v2 ?
|
||||||
|
v2.getFeatures() : Collections.emptyList()) + "]");
|
||||||
|
mLibraryLoadStatusLogged.add(codecStatusKey);
|
||||||
|
}
|
||||||
|
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.info("JMBE audio conversion library loaded: " + library.getVersion());
|
LOG.info("JMBE audio conversion library loaded: " + library.getVersion());
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -181,7 +253,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.warn("JMBE library version 1.0.0 or higher is required - found: " + library.getVersion());
|
LOG.warn("JMBE library version 1.0.0 or higher is required - found: " + library.getVersion());
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -190,7 +262,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.info("JMBE audio conversion library NOT FOUND");
|
LOG.info("JMBE audio conversion library NOT FOUND");
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -199,7 +271,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.error("Couldn't load JMBE audio conversion library - invocation target exception", ite);
|
LOG.error("Couldn't load JMBE audio conversion library - invocation target exception", ite);
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -207,7 +279,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.error("Couldn't load JMBE audio conversion library - instantiation exception", e1);
|
LOG.error("Couldn't load JMBE audio conversion library - instantiation exception", e1);
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -215,7 +287,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.error("Couldn't load JMBE audio conversion library - security restrictions");
|
LOG.error("Couldn't load JMBE audio conversion library - security restrictions");
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -223,7 +295,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.error("Couldn't load JMBE audio conversion library - no such method exception");
|
LOG.error("Couldn't load JMBE audio conversion library - no such method exception");
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,7 +304,7 @@ public abstract class JmbeAudioModule extends AbstractAudioModule implements Lis
|
|||||||
{
|
{
|
||||||
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
if(!mLibraryLoadStatusLogged.contains(JMBE_AUDIO_LIBRARY))
|
||||||
{
|
{
|
||||||
mLog.warn("JMBE audio library path is NOT SET in your User Preferences.");
|
LOG.warn("JMBE audio library path is NOT SET in your User Preferences.");
|
||||||
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
mLibraryLoadStatusLogged.add(JMBE_AUDIO_LIBRARY);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* *****************************************************************************
|
* *****************************************************************************
|
||||||
* Copyright (C) 2014-2022 Dennis Sheirer
|
* Copyright (C) 2014-2026 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
|
||||||
@@ -26,7 +26,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder;
|
|||||||
import com.fasterxml.jackson.annotation.JsonRootName;
|
import com.fasterxml.jackson.annotation.JsonRootName;
|
||||||
import io.github.dsheirer.identifier.Identifier;
|
import io.github.dsheirer.identifier.Identifier;
|
||||||
import io.github.dsheirer.identifier.encryption.EncryptionKey;
|
import io.github.dsheirer.identifier.encryption.EncryptionKey;
|
||||||
import io.github.dsheirer.module.decode.p25.audio.VoiceFrame;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -36,7 +35,7 @@ import java.util.List;
|
|||||||
* radio identifiers.
|
* radio identifiers.
|
||||||
*/
|
*/
|
||||||
@JsonRootName("mbe_call")
|
@JsonRootName("mbe_call")
|
||||||
@JsonPropertyOrder({"protocol", "call_type", "from", "to", "encrypted", "frames"})
|
@JsonPropertyOrder({"protocol", "version", "call_type", "from", "to", "encrypted", "system", "site", "frames"})
|
||||||
@JsonInclude(JsonInclude.Include.NON_NULL)
|
@JsonInclude(JsonInclude.Include.NON_NULL)
|
||||||
public class MBECallSequence
|
public class MBECallSequence
|
||||||
{
|
{
|
||||||
@@ -77,6 +76,15 @@ public class MBECallSequence
|
|||||||
mProtocol = protocol;
|
mProtocol = protocol;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the version number for the mbe file structure.
|
||||||
|
* Should be incremented only on breaking structural changes, not minor additions.
|
||||||
|
*/
|
||||||
|
@JsonProperty("version")
|
||||||
|
public Integer getVersion()
|
||||||
|
{
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Indicates if this sequences contains any audio frames
|
* Indicates if this sequences contains any audio frames
|
||||||
@@ -279,10 +287,18 @@ public class MBECallSequence
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mVoiceFrames.add(new VoiceFrame(timestamp, frame));
|
add(new VoiceFrame(timestamp, frame));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Adds the voice frame to the sequence
|
||||||
|
*/
|
||||||
|
public void add(VoiceFrame voiceFrame)
|
||||||
|
{
|
||||||
|
mVoiceFrames.add(voiceFrame);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Adds an encrypted audio frame to this call sequence
|
* Adds an encrypted audio frame to this call sequence
|
||||||
*
|
*
|
||||||
@@ -308,6 +324,6 @@ public class MBECallSequence
|
|||||||
*/
|
*/
|
||||||
public void addEncryptedVoiceFrame(long timestamp, String frame, int algorithm, int keyid, String messageIndicator)
|
public void addEncryptedVoiceFrame(long timestamp, String frame, int algorithm, int keyid, String messageIndicator)
|
||||||
{
|
{
|
||||||
mVoiceFrames.add(new VoiceFrame(timestamp, frame, algorithm, keyid, messageIndicator));
|
add(new VoiceFrame(timestamp, frame, algorithm, keyid, messageIndicator));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user