mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-08-26 12:06:57 +02:00
Compare commits
19
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2da9ba8152
|
||
|
|
2693c3191f
|
||
|
|
4650c77227
|
||
|
|
69c870284d
|
||
|
|
29857b8f1b
|
||
|
|
13c60291cc
|
||
|
|
2d32eaf462
|
||
|
|
04b9e0e75c
|
||
|
|
f7cb26fed5
|
||
|
|
e898f6875d
|
||
|
|
1ce468145c
|
||
|
|
2f4aac8cf7
|
||
|
|
94a5f6a9f7
|
||
|
|
3070d03893 | ||
|
|
a53e6a420f
|
||
|
|
57deda4b94
|
||
|
|
3632a0fcc9
|
||
|
|
ff6b8b75a6
|
||
|
|
eee1594d30
|
@@ -12,7 +12,7 @@ env:
|
|||||||
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
|
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: read
|
||||||
packages: write
|
packages: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -453,103 +453,18 @@ jobs:
|
|||||||
path: flatpak-src/KST4Contest
|
path: flatpak-src/KST4Contest
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
- name: Import Flatpak signing key
|
- name: Build Flatpak bundle
|
||||||
run: |
|
|
||||||
echo "${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}" | gpg --batch --import
|
|
||||||
FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')
|
|
||||||
echo "FLATPAK_GPG_KEY_ID=$FLATPAK_GPG_KEY_ID" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Build Flatpak repo (nightly)
|
|
||||||
run: |
|
run: |
|
||||||
flatpak-builder --force-clean target/flatpak-build target/de.x08.KST4Contest.yml
|
flatpak-builder --force-clean target/flatpak-build target/de.x08.KST4Contest.yml
|
||||||
flatpak build-export --gpg-sign="$FLATPAK_GPG_KEY_ID" target/flatpak-repo target/flatpak-build nightly
|
flatpak build-export target/flatpak-repo target/flatpak-build
|
||||||
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" target/flatpak-repo
|
flatpak build-bundle target/flatpak-repo "dist/${ASSET_BASENAME}-linux-x86_64.flatpak" de.x08.KST4Contest
|
||||||
|
|
||||||
- name: Create flatpakref (nightly)
|
- name: Upload Flatpak artifact
|
||||||
run: |
|
|
||||||
REPO_NAME="${GITHUB_REPOSITORY#*/}"
|
|
||||||
PAGES_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/${REPO_NAME}/"
|
|
||||||
GPG_KEY_B64=$(gpg --export "$FLATPAK_GPG_KEY_ID" | base64 -w 0)
|
|
||||||
cat > "dist/de.x08.KST4Contest.nightly.flatpakref" << EOF
|
|
||||||
[Flatpak Ref]
|
|
||||||
Name=de.x08.KST4Contest
|
|
||||||
Branch=nightly
|
|
||||||
Title=KST4Contest (Nightly) – ON4KST Chat Client
|
|
||||||
Url=${PAGES_URL}
|
|
||||||
RuntimeRepo=https://flathub.org/repo/flathub.flatpakrepo
|
|
||||||
GPGKey=${GPG_KEY_B64}
|
|
||||||
IsRuntime=false
|
|
||||||
EOF
|
|
||||||
|
|
||||||
- name: Upload flatpakref
|
|
||||||
uses: actions/upload-artifact@v4.3.4
|
uses: actions/upload-artifact@v4.3.4
|
||||||
with:
|
with:
|
||||||
name: flatpakref
|
name: linux-flatpak
|
||||||
path: dist/de.x08.KST4Contest.nightly.flatpakref
|
path: dist/KST4Contest-*-linux-x86_64.flatpak
|
||||||
|
retention-days: 14
|
||||||
- name: Upload Flatpak OSTree repo
|
|
||||||
uses: actions/upload-artifact@v4.3.4
|
|
||||||
with:
|
|
||||||
name: flatpak-ostree-repo
|
|
||||||
path: target/flatpak-repo/
|
|
||||||
|
|
||||||
publish-flatpak-repo:
|
|
||||||
name: Publish Flatpak OSTree Repo (nightly)
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
needs: build-flatpak
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Install Flatpak tooling
|
|
||||||
run: |
|
|
||||||
sudo apt-get update -qq
|
|
||||||
sudo apt-get install -y --no-install-recommends flatpak
|
|
||||||
|
|
||||||
- name: Import Flatpak signing key
|
|
||||||
run: |
|
|
||||||
echo "${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}" | gpg --batch --import
|
|
||||||
echo "FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Download OSTree repo artifact
|
|
||||||
uses: actions/download-artifact@v4.1.3
|
|
||||||
with:
|
|
||||||
name: flatpak-ostree-repo
|
|
||||||
path: flatpak-ostree-repo/
|
|
||||||
|
|
||||||
- name: Checkout existing flatpak-repo branch
|
|
||||||
uses: actions/checkout@v4.1.7
|
|
||||||
with:
|
|
||||||
ref: flatpak-repo
|
|
||||||
path: existing-flatpak-repo
|
|
||||||
|
|
||||||
- name: Merge nightly build into flatpak-repo
|
|
||||||
run: |
|
|
||||||
cd existing-flatpak-repo
|
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
|
||||||
git config user.name "github-actions[bot]"
|
|
||||||
# Copy the new OSTree build into the repo
|
|
||||||
rsync -a ../flatpak-ostree-repo/ ./
|
|
||||||
# Regenerate summary with all branches
|
|
||||||
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" .
|
|
||||||
# Generate .flatpakrepo with embedded GPG key so users can do remote-add without errors
|
|
||||||
REPO_NAME="${GITHUB_REPOSITORY#*/}"
|
|
||||||
PAGES_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/${REPO_NAME}/"
|
|
||||||
GPG_KEY_B64=$(gpg --export "$FLATPAK_GPG_KEY_ID" | base64 -w 0)
|
|
||||||
cat > kst4contest.flatpakrepo << EOF
|
|
||||||
[Flatpak Repo]
|
|
||||||
Title=KST4Contest
|
|
||||||
Url=${PAGES_URL}
|
|
||||||
Homepage=https://github.com/${GITHUB_REPOSITORY}
|
|
||||||
Comment=KST4Contest – ON4KST Chat Client for VHF/UHF contests
|
|
||||||
GPGKey=${GPG_KEY_B64}
|
|
||||||
EOF
|
|
||||||
# Stage all changes (new/updated refs, summary, objects in OSTree)
|
|
||||||
git add -A
|
|
||||||
if git diff --cached --quiet; then
|
|
||||||
echo "No changes to commit"
|
|
||||||
else
|
|
||||||
git commit -m "Nightly flatpak: $(echo ${{ github.sha }} | cut -c1-7)"
|
|
||||||
git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:flatpak-repo
|
|
||||||
fi
|
|
||||||
|
|
||||||
build-macos-dmg:
|
build-macos-dmg:
|
||||||
name: Build macOS DMG (${{ matrix.os }})
|
name: Build macOS DMG (${{ matrix.os }})
|
||||||
|
|||||||
@@ -11,18 +11,18 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
compile:
|
compile:
|
||||||
name: Compile (Java 17)
|
name: Compile (Java 21)
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/checkout@v4.1.7
|
||||||
|
|
||||||
- name: Set up Java 17
|
- name: Set up Java 21
|
||||||
uses: actions/setup-java@v4.1.0
|
uses: actions/setup-java@v4.1.0
|
||||||
with:
|
with:
|
||||||
distribution: temurin
|
distribution: temurin
|
||||||
java-version: "17"
|
java-version: "21"
|
||||||
|
|
||||||
- name: Ensure mvnw is executable
|
- name: Ensure mvnw is executable
|
||||||
run: chmod +x mvnw
|
run: chmod +x mvnw
|
||||||
|
|||||||
@@ -408,18 +408,10 @@ jobs:
|
|||||||
FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')
|
FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')
|
||||||
echo "FLATPAK_GPG_KEY_ID=$FLATPAK_GPG_KEY_ID" >> "$GITHUB_ENV"
|
echo "FLATPAK_GPG_KEY_ID=$FLATPAK_GPG_KEY_ID" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
- name: Determine OSTree branch
|
|
||||||
run: |
|
|
||||||
if [[ "${{ github.ref_name }}" == beta-* ]]; then
|
|
||||||
echo "OSTREE_BRANCH=beta" >> "$GITHUB_ENV"
|
|
||||||
else
|
|
||||||
echo "OSTREE_BRANCH=stable" >> "$GITHUB_ENV"
|
|
||||||
fi
|
|
||||||
|
|
||||||
- name: Build Flatpak repo
|
- name: Build Flatpak repo
|
||||||
run: |
|
run: |
|
||||||
flatpak-builder --force-clean target/flatpak-build target/de.x08.KST4Contest.yml
|
flatpak-builder --force-clean target/flatpak-build target/de.x08.KST4Contest.yml
|
||||||
flatpak build-export --gpg-sign="$FLATPAK_GPG_KEY_ID" target/flatpak-repo target/flatpak-build "$OSTREE_BRANCH"
|
flatpak build-export --gpg-sign="$FLATPAK_GPG_KEY_ID" target/flatpak-repo target/flatpak-build stable
|
||||||
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" target/flatpak-repo
|
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" target/flatpak-repo
|
||||||
|
|
||||||
- name: Create flatpakref
|
- name: Create flatpakref
|
||||||
@@ -427,11 +419,11 @@ jobs:
|
|||||||
REPO_NAME="${GITHUB_REPOSITORY#*/}"
|
REPO_NAME="${GITHUB_REPOSITORY#*/}"
|
||||||
PAGES_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/${REPO_NAME}/"
|
PAGES_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/${REPO_NAME}/"
|
||||||
GPG_KEY_B64=$(gpg --export "$FLATPAK_GPG_KEY_ID" | base64 -w 0)
|
GPG_KEY_B64=$(gpg --export "$FLATPAK_GPG_KEY_ID" | base64 -w 0)
|
||||||
cat > "dist/de.x08.KST4Contest.${OSTREE_BRANCH}.flatpakref" << EOF
|
cat > "dist/de.x08.KST4Contest.flatpakref" << EOF
|
||||||
[Flatpak Ref]
|
[Flatpak Ref]
|
||||||
Name=de.x08.KST4Contest
|
Name=de.x08.KST4Contest
|
||||||
Branch=${OSTREE_BRANCH}
|
Branch=stable
|
||||||
Title=KST4Contest (${{ startsWith(github.ref_name, 'beta-') && 'Beta' || 'Release' }}) – ON4KST Chat Client
|
Title=KST4Contest – ON4KST Chat Client
|
||||||
Url=${PAGES_URL}
|
Url=${PAGES_URL}
|
||||||
RuntimeRepo=https://flathub.org/repo/flathub.flatpakrepo
|
RuntimeRepo=https://flathub.org/repo/flathub.flatpakrepo
|
||||||
GPGKey=${GPG_KEY_B64}
|
GPGKey=${GPG_KEY_B64}
|
||||||
@@ -442,7 +434,7 @@ jobs:
|
|||||||
uses: actions/upload-artifact@v4.3.4
|
uses: actions/upload-artifact@v4.3.4
|
||||||
with:
|
with:
|
||||||
name: flatpakref
|
name: flatpakref
|
||||||
path: dist/de.x08.KST4Contest.*.flatpakref
|
path: dist/de.x08.KST4Contest.flatpakref
|
||||||
|
|
||||||
- name: Upload Flatpak OSTree repo
|
- name: Upload Flatpak OSTree repo
|
||||||
uses: actions/upload-artifact@v4.3.4
|
uses: actions/upload-artifact@v4.3.4
|
||||||
@@ -584,60 +576,32 @@ jobs:
|
|||||||
path: dist/KST4Contest-${{ github.ref_name }}-manual-*.pdf
|
path: dist/KST4Contest-${{ github.ref_name }}-manual-*.pdf
|
||||||
|
|
||||||
publish-flatpak-repo:
|
publish-flatpak-repo:
|
||||||
name: Publish Flatpak OSTree Repo (${{ github.ref_name }})
|
name: Publish Flatpak OSTree Repo to GitHub Pages
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: build-flatpak
|
needs: build-flatpak
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Install Flatpak tooling
|
|
||||||
run: |
|
|
||||||
sudo apt-get update -qq
|
|
||||||
sudo apt-get install -y --no-install-recommends flatpak
|
|
||||||
|
|
||||||
- name: Import Flatpak signing key
|
|
||||||
run: |
|
|
||||||
echo "${{ secrets.FLATPAK_GPG_PRIVATE_KEY }}" | gpg --batch --import
|
|
||||||
echo "FLATPAK_GPG_KEY_ID=$(gpg --list-secret-keys --with-colons | awk -F: '/^fpr/{print $10; exit}')" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Download OSTree repo artifact
|
- name: Download OSTree repo artifact
|
||||||
uses: actions/download-artifact@v4.1.3
|
uses: actions/download-artifact@v4.1.3
|
||||||
with:
|
with:
|
||||||
name: flatpak-ostree-repo
|
name: flatpak-ostree-repo
|
||||||
path: flatpak-ostree-repo/
|
path: flatpak-ostree-repo/
|
||||||
|
|
||||||
- name: Checkout existing flatpak-repo branch
|
- name: Download flatpakref
|
||||||
uses: actions/checkout@v4.1.7
|
uses: actions/download-artifact@v4.1.3
|
||||||
with:
|
with:
|
||||||
ref: flatpak-repo
|
name: flatpakref
|
||||||
path: existing-flatpak-repo
|
path: flatpak-ostree-repo/
|
||||||
|
|
||||||
- name: Merge build into flatpak-repo
|
- name: Push to flatpak-repo branch
|
||||||
run: |
|
run: |
|
||||||
cd existing-flatpak-repo
|
cd flatpak-ostree-repo
|
||||||
|
git init
|
||||||
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
git config user.name "github-actions[bot]"
|
git config user.name "github-actions[bot]"
|
||||||
rsync -a ../flatpak-ostree-repo/ ./
|
|
||||||
# Regenerate summary with all branches (not just the one just built)
|
|
||||||
flatpak build-update-repo --gpg-sign="$FLATPAK_GPG_KEY_ID" .
|
|
||||||
# Generate .flatpakrepo with embedded GPG key so users can do remote-add without errors
|
|
||||||
REPO_NAME="${GITHUB_REPOSITORY#*/}"
|
|
||||||
PAGES_URL="https://${GITHUB_REPOSITORY_OWNER}.github.io/${REPO_NAME}/"
|
|
||||||
GPG_KEY_B64=$(gpg --export "$FLATPAK_GPG_KEY_ID" | base64 -w 0)
|
|
||||||
cat > kst4contest.flatpakrepo << EOF
|
|
||||||
[Flatpak Repo]
|
|
||||||
Title=KST4Contest
|
|
||||||
Url=${PAGES_URL}
|
|
||||||
Homepage=https://github.com/${GITHUB_REPOSITORY}
|
|
||||||
Comment=KST4Contest – ON4KST Chat Client for VHF/UHF contests
|
|
||||||
GPGKey=${GPG_KEY_B64}
|
|
||||||
EOF
|
|
||||||
git add -A
|
git add -A
|
||||||
if git diff --cached --quiet; then
|
git commit -m "Flatpak repo: ${{ github.ref_name }}"
|
||||||
echo "No changes to commit"
|
git push --force https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:flatpak-repo
|
||||||
else
|
|
||||||
git commit -m "Flatpak repo: ${{ github.ref_name }}"
|
|
||||||
git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:flatpak-repo
|
|
||||||
fi
|
|
||||||
|
|
||||||
release-tag:
|
release-tag:
|
||||||
name: Publish Tagged Release
|
name: Publish Tagged Release
|
||||||
|
|||||||
@@ -24,12 +24,12 @@
|
|||||||
<launcher>${project.artifactId}</launcher>
|
<launcher>${project.artifactId}</launcher>
|
||||||
<appName>${project.artifactId}</appName>
|
<appName>${project.artifactId}</appName>
|
||||||
<main.class>kst4contest.view.Kst4ContestApplication</main.class>
|
<main.class>kst4contest.view.Kst4ContestApplication</main.class>
|
||||||
<java.version>17</java.version>
|
<java.version>21</java.version>
|
||||||
<required.maven.version>3.6.3</required.maven.version>
|
<required.maven.version>3.6.3</required.maven.version>
|
||||||
<jar.filename>${project.artifactId}-${project.version}</jar.filename>
|
<jar.filename>${project.artifactId}-${project.version}</jar.filename>
|
||||||
|
|
||||||
<!-- Dependency versions -->
|
<!-- Dependency versions -->
|
||||||
<javafx.version>19.0.2.1</javafx.version>
|
<javafx.version>21.0.5</javafx.version>
|
||||||
<jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
|
<jetbrains.annotations.version>24.0.1</jetbrains.annotations.version>
|
||||||
<junit.version>5.10.1</junit.version>
|
<junit.version>5.10.1</junit.version>
|
||||||
<lombok.version>1.18.44</lombok.version>
|
<lombok.version>1.18.44</lombok.version>
|
||||||
@@ -50,8 +50,8 @@
|
|||||||
<maven.wrapper.plugin>3.2.0</maven.wrapper.plugin>
|
<maven.wrapper.plugin>3.2.0</maven.wrapper.plugin>
|
||||||
<moditect.maven.plugin>1.0.0.RC2</moditect.maven.plugin>
|
<moditect.maven.plugin>1.0.0.RC2</moditect.maven.plugin>
|
||||||
<jpackage.maven.plugin>0.1.3</jpackage.maven.plugin>
|
<jpackage.maven.plugin>0.1.3</jpackage.maven.plugin>
|
||||||
<maven.pmd.version>3.21.2</maven.pmd.version>
|
<maven.pmd.version>3.28.0</maven.pmd.version>
|
||||||
<pmd.version>6.55.0</pmd.version>
|
<pmd.version>7.17.0</pmd.version>
|
||||||
<codehaus.version.plugin>2.16.1</codehaus.version.plugin>
|
<codehaus.version.plugin>2.16.1</codehaus.version.plugin>
|
||||||
<javafx.maven.plugin>0.0.8</javafx.maven.plugin>
|
<javafx.maven.plugin>0.0.8</javafx.maven.plugin>
|
||||||
<spotbugs.maven.plugin>4.9.8.2</spotbugs.maven.plugin>
|
<spotbugs.maven.plugin>4.9.8.2</spotbugs.maven.plugin>
|
||||||
@@ -93,6 +93,13 @@
|
|||||||
<version>${javafx.version}</version>
|
<version>${javafx.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- JLayer: pure-Java MP3 decoder, used instead of JavaFX Media for Flatpak audio compatibility -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>javazoom</groupId>
|
||||||
|
<artifactId>jlayer</artifactId>
|
||||||
|
<version>1.0.1</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- SQLite -->
|
<!-- SQLite -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.xerial</groupId>
|
<groupId>org.xerial</groupId>
|
||||||
@@ -280,30 +287,7 @@
|
|||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-pmd-plugin</artifactId>
|
<artifactId>maven-pmd-plugin</artifactId>
|
||||||
<version>${maven.pmd.version}</version>
|
<version>${maven.pmd.version}</version>
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-core</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-java</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-javascript</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.sourceforge.pmd</groupId>
|
|
||||||
<artifactId>pmd-jsp</artifactId>
|
|
||||||
<version>${pmd.version}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
|
|
||||||
<minimumTokens>100</minimumTokens>
|
<minimumTokens>100</minimumTokens>
|
||||||
<targetJdk>${java.version}</targetJdk>
|
<targetJdk>${java.version}</targetJdk>
|
||||||
<linkXRef>false</linkXRef>
|
<linkXRef>false</linkXRef>
|
||||||
@@ -436,6 +420,7 @@
|
|||||||
<addmodule>javafx.graphics</addmodule>
|
<addmodule>javafx.graphics</addmodule>
|
||||||
<addmodule>javafx.fxml</addmodule>
|
<addmodule>javafx.fxml</addmodule>
|
||||||
<addmodule>javafx.web</addmodule>
|
<addmodule>javafx.web</addmodule>
|
||||||
|
<addmodule>javafx.media</addmodule>
|
||||||
<addmodule>java.sql</addmodule>
|
<addmodule>java.sql</addmodule>
|
||||||
<addmodule>java.net.http</addmodule>
|
<addmodule>java.net.http</addmodule>
|
||||||
<addmodule>jdk.crypto.ec</addmodule>
|
<addmodule>jdk.crypto.ec</addmodule>
|
||||||
|
|||||||
@@ -1,13 +1,18 @@
|
|||||||
package kst4contest.utils;
|
package kst4contest.utils;
|
||||||
|
|
||||||
import javafx.scene.media.Media;
|
import javazoom.jl.decoder.JavaLayerException;
|
||||||
import javafx.scene.media.MediaPlayer;
|
import javazoom.jl.player.Player;
|
||||||
import kst4contest.ApplicationConstants;
|
import kst4contest.ApplicationConstants;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.BufferedInputStream;
|
||||||
|
import java.io.FileInputStream;
|
||||||
|
import java.io.IOException;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.LinkedList;
|
|
||||||
import java.util.Queue;
|
import java.util.Queue;
|
||||||
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This part of the client drives the sounds. Its a singleton instance. All audio outs are directed to this instance.<br>
|
* This part of the client drives the sounds. Its a singleton instance. All audio outs are directed to this instance.<br>
|
||||||
@@ -113,8 +118,16 @@ public class PlayAudioUtils {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Queue<Media> musicList = new LinkedList<Media>();
|
private final Queue<String> musicList = new ConcurrentLinkedQueue<>();
|
||||||
private MediaPlayer mediaPlayer ;
|
/** True once audio fails; prevents repeated error logs and further play attempts. */
|
||||||
|
private final AtomicBoolean audioUnavailable = new AtomicBoolean(false);
|
||||||
|
/** True while the drain loop is running; prevents duplicate concurrent drains. */
|
||||||
|
private final AtomicBoolean playing = new AtomicBoolean(false);
|
||||||
|
private final ExecutorService audioThread = Executors.newSingleThreadExecutor(r -> {
|
||||||
|
Thread t = new Thread(r, "audio-player");
|
||||||
|
t.setDaemon(true);
|
||||||
|
return t;
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Plays notification sounds out of the windws 95 box by given action character<br/>
|
* Plays notification sounds out of the windws 95 box by given action character<br/>
|
||||||
@@ -131,40 +144,31 @@ public class PlayAudioUtils {
|
|||||||
*/
|
*/
|
||||||
public void playNoiseLauncher(char actionChar) {
|
public void playNoiseLauncher(char actionChar) {
|
||||||
|
|
||||||
|
switch (actionChar){
|
||||||
|
case '-':
|
||||||
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/tick.mp3"));
|
||||||
|
break;
|
||||||
|
case '!':
|
||||||
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISESTARTUP.mp3"));
|
||||||
|
break;
|
||||||
|
case 'C':
|
||||||
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISECQWINDOW.mp3"));
|
||||||
|
break;
|
||||||
|
case 'P':
|
||||||
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEPMWINDOW.mp3"));
|
||||||
|
break;
|
||||||
|
case 'E':
|
||||||
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEERROR.mp3"));
|
||||||
|
break;
|
||||||
|
case 'N':
|
||||||
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISENOTIFY.mp3"));
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
// ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISESTARTUP.mp3");
|
System.out.println("[KST4ContestApp, warning, letter not defined!]");
|
||||||
|
|
||||||
|
|
||||||
switch (actionChar){
|
|
||||||
case '-':
|
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/tick.mp3")).toURI().toString()));
|
|
||||||
break;
|
|
||||||
case '!':
|
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISESTARTUP.mp3")).toURI().toString()));
|
|
||||||
break;
|
|
||||||
case 'C':
|
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISECQWINDOW.mp3")).toURI().toString()));
|
|
||||||
break;
|
|
||||||
case 'P':
|
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEPMWINDOW.mp3")).toURI().toString()));
|
|
||||||
break;
|
|
||||||
case 'E':
|
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISEERROR.mp3")).toURI().toString()));
|
|
||||||
break;
|
|
||||||
case 'N':
|
|
||||||
musicList.add(new Media(new File (ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/NOISENOTIFY.mp3")).toURI().toString()));
|
|
||||||
break;
|
|
||||||
// case 'M':
|
|
||||||
// musicList.add(new Media(new File ("VOICE.mp3").toURI().toString()));
|
|
||||||
// break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
System.out.println("[KST4ContestApp, warning, letter not defined!]");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
playMusic();
|
playMusic();
|
||||||
// mediaPlayer.dispose();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -183,125 +187,124 @@ public class PlayAudioUtils {
|
|||||||
for (char letterToPlay: playThisInCW){
|
for (char letterToPlay: playThisInCW){
|
||||||
switch (letterToPlay){
|
switch (letterToPlay){
|
||||||
case 'A':
|
case 'A':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRA.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRA.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'B':
|
case 'B':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRB.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRB.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRC.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRC.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRD.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRD.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'E':
|
case 'E':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRE.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRF.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRF.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'G':
|
case 'G':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRG.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRG.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'H':
|
case 'H':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRH.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRH.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'I':
|
case 'I':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRI.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRI.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'J':
|
case 'J':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRJ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRJ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'K':
|
case 'K':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRK.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRK.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'L':
|
case 'L':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRL.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'M':
|
case 'M':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRM.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRM.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'N':
|
case 'N':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRN.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRN.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'O':
|
case 'O':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRO.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRO.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'P':
|
case 'P':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRP.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRP.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Q':
|
case 'Q':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRQ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRQ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'R':
|
case 'R':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRR.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRR.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'S':
|
case 'S':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRS.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRS.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'T':
|
case 'T':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRT.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRT.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'U':
|
case 'U':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRU.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRU.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRV.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRV.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'W':
|
case 'W':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRW.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRW.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'X':
|
case 'X':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRX.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRX.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Y':
|
case 'Y':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRY.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRY.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Z':
|
case 'Z':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRZ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRZ.mp3"));
|
||||||
break;
|
break;
|
||||||
case '1':
|
case '1':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR1.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR1.mp3"));
|
||||||
break;
|
break;
|
||||||
case '2':
|
case '2':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR2.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR2.mp3"));
|
||||||
break;
|
break;
|
||||||
case '3':
|
case '3':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR3.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR3.mp3"));
|
||||||
break;
|
break;
|
||||||
case '4':
|
case '4':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR4.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR4.mp3"));
|
||||||
break;
|
break;
|
||||||
case '5':
|
case '5':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR5.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR5.mp3"));
|
||||||
break;
|
break;
|
||||||
case '6':
|
case '6':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR6.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR6.mp3"));
|
||||||
break;
|
break;
|
||||||
case '7':
|
case '7':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR7.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR7.mp3"));
|
||||||
break;
|
break;
|
||||||
case '8':
|
case '8':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR8.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR8.mp3"));
|
||||||
break;
|
break;
|
||||||
case '9':
|
case '9':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR9.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR9.mp3"));
|
||||||
break;
|
break;
|
||||||
case '0':
|
case '0':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR0.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTR0.mp3"));
|
||||||
break;
|
break;
|
||||||
case '/':
|
case '/':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSTROKE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSTROKE.mp3"));
|
||||||
break;
|
break;
|
||||||
case ' ':
|
case ' ':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSPACE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/LTTRSPACE.mp3"));
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(playThisInCW));
|
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(playThisInCW));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
playMusic();
|
playMusic();
|
||||||
// mediaPlayer.dispose();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -323,162 +326,166 @@ public class PlayAudioUtils {
|
|||||||
for (char letterToPlay: spellThisWithVoice){
|
for (char letterToPlay: spellThisWithVoice){
|
||||||
switch (letterToPlay){
|
switch (letterToPlay){
|
||||||
case '!':
|
case '!':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEBELL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEBELL.mp3"));
|
||||||
break;
|
break;
|
||||||
case '?':
|
case '?':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEYOUGOTMAIL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEYOUGOTMAIL.mp3"));
|
||||||
break;
|
break;
|
||||||
case '#':
|
case '#':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEHELLO.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEHELLO.mp3"));
|
||||||
break;
|
break;
|
||||||
case '*':
|
case '*':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE73.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE73.mp3"));
|
||||||
break;
|
break;
|
||||||
case '$':
|
case '$':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKEPORTABLE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKEPORTABLE.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'A':
|
case 'A':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEA.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEA.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'B':
|
case 'B':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEB.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEB.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEC.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEC.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'D':
|
case 'D':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICED.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICED.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'E':
|
case 'E':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEE.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'F':
|
case 'F':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEF.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEF.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'G':
|
case 'G':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEG.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEG.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'H':
|
case 'H':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEH.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEH.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'I':
|
case 'I':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEI.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEI.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'J':
|
case 'J':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEJ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEJ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'K':
|
case 'K':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEK.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEK.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'L':
|
case 'L':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEL.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEL.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'M':
|
case 'M':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEM.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEM.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'N':
|
case 'N':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEN.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEN.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'O':
|
case 'O':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEO.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEO.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'P':
|
case 'P':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEP.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEP.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Q':
|
case 'Q':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEQ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEQ.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'R':
|
case 'R':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICER.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICER.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'S':
|
case 'S':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICES.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICES.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'T':
|
case 'T':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICET.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICET.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'U':
|
case 'U':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEU.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEU.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'V':
|
case 'V':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEV.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEV.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'W':
|
case 'W':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEW.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEW.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'X':
|
case 'X':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEX.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEX.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Y':
|
case 'Y':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEY.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEY.mp3"));
|
||||||
break;
|
break;
|
||||||
case 'Z':
|
case 'Z':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEZ.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICEZ.mp3"));
|
||||||
break;
|
break;
|
||||||
case '1':
|
case '1':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE1.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE1.mp3"));
|
||||||
break;
|
break;
|
||||||
case '2':
|
case '2':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE2.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE2.mp3"));
|
||||||
break;
|
break;
|
||||||
case '3':
|
case '3':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE3.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE3.mp3"));
|
||||||
break;
|
break;
|
||||||
case '4':
|
case '4':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE4.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE4.mp3"));
|
||||||
break;
|
break;
|
||||||
case '5':
|
case '5':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE5.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE5.mp3"));
|
||||||
break;
|
break;
|
||||||
case '6':
|
case '6':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE6.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE6.mp3"));
|
||||||
break;
|
break;
|
||||||
case '7':
|
case '7':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE7.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE7.mp3"));
|
||||||
break;
|
break;
|
||||||
case '8':
|
case '8':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE8.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE8.mp3"));
|
||||||
break;
|
break;
|
||||||
case '9':
|
case '9':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE9.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE9.mp3"));
|
||||||
break;
|
break;
|
||||||
case '0':
|
case '0':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE0.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICE0.mp3"));
|
||||||
break;
|
break;
|
||||||
case '/':
|
case '/':
|
||||||
musicList.add(new Media(new File(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKE.mp3")).toURI().toString()));
|
musicList.add(ApplicationFileUtils.getFilePath(ApplicationConstants.APPLICATION_NAME, "/VOICESTROKE.mp3"));
|
||||||
break;
|
break;
|
||||||
// case ' ':
|
|
||||||
// musicList.add(new Media(new File ("VOICESPACE.mp3").toURI().toString()));
|
|
||||||
// break;
|
|
||||||
default:
|
default:
|
||||||
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(spellThisWithVoice));
|
System.out.println("[KST4ContestApp, warning, letter not defined:] cwLetters = " + Arrays.toString(spellThisWithVoice));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
playMusic();
|
playMusic();
|
||||||
// mediaPlayer.dispose();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
private void playMusic() {
|
|
||||||
|
|
||||||
// System.out.println("Kst4ContestApplication.playMusic");
|
private void playMusic() {
|
||||||
if(musicList.peek() == null)
|
if (audioUnavailable.get()) {
|
||||||
{
|
musicList.clear();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
mediaPlayer = new MediaPlayer(musicList.poll());
|
// Only start a drain loop if none is running; the running loop will pick up new items itself.
|
||||||
mediaPlayer.setRate(1.0);
|
if (!playing.compareAndSet(false, true)) return;
|
||||||
|
audioThread.submit(() -> {
|
||||||
mediaPlayer.setOnReady(() -> {
|
String path;
|
||||||
mediaPlayer.play();
|
while ((path = musicList.poll()) != null) {
|
||||||
mediaPlayer.setOnEndOfMedia(() -> {
|
if (audioUnavailable.get()) break;
|
||||||
// mediaPlayer.dispose();
|
try (FileInputStream fis = new FileInputStream(path);
|
||||||
playMusic();
|
BufferedInputStream bis = new BufferedInputStream(fis)) {
|
||||||
if (musicList.isEmpty()) {
|
new Player(bis).play();
|
||||||
// mediaPlayer.dispose();
|
} catch (IOException | JavaLayerException e) {
|
||||||
|
audioUnavailable.set(true);
|
||||||
|
musicList.clear();
|
||||||
|
System.out.println("[KST4ContestApp, warning, audio playback disabled (could not create media player): " + e + "]");
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
|
playing.set(false);
|
||||||
|
// Items may have been enqueued between the last poll() and playing.set(false);
|
||||||
|
// restart the drain loop if so.
|
||||||
|
if (!musicList.isEmpty() && !audioUnavailable.get()) {
|
||||||
|
playMusic();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ module praktiKST {
|
|||||||
requires java.sql;
|
requires java.sql;
|
||||||
requires javafx.media;
|
requires javafx.media;
|
||||||
requires jdk.jsobject;
|
requires jdk.jsobject;
|
||||||
|
requires jlayer;
|
||||||
requires java.net.http;
|
requires java.net.http;
|
||||||
requires java.desktop;
|
requires java.desktop;
|
||||||
requires jdk.crypto.ec;
|
requires jdk.crypto.ec;
|
||||||
|
|||||||
Reference in New Issue
Block a user