{props.radio.getName()}
-
{getApp().getAudioManager().removeSink(props.radio);}}>
+
{getApp().getAudioManager().removeSink(props.radio);}}>
diff --git a/frontend/react/src/ui/panels/components/sourcepanel.tsx b/frontend/react/src/ui/panels/components/sourcepanel.tsx
new file mode 100644
index 00000000..de5e818e
--- /dev/null
+++ b/frontend/react/src/ui/panels/components/sourcepanel.tsx
@@ -0,0 +1,141 @@
+import React, { useEffect, useState } from "react";
+import { OlStateButton } from "../../components/olstatebutton";
+import { faPause, faPlay, faRepeat, faStop } from "@fortawesome/free-solid-svg-icons";
+import { getApp } from "../../../olympusapp";
+import { AudioSource } from "../../../audio/audiosource";
+import { FaArrowRight, FaTrash, FaVolumeHigh } from "react-icons/fa6";
+import { OlRangeSlider } from "../../components/olrangeslider";
+import { FaUnlink } from "react-icons/fa";
+import { OlDropdown, OlDropdownItem } from "../../components/oldropdown";
+import { FileSource } from "../../../audio/filesource";
+import { MicrophoneSource } from "../../../audio/microphonesource";
+
+export function AudioSourcePanel(props: { source: AudioSource }) {
+ const [meterLevel, setMeterLevel] = useState(0);
+
+ useEffect(() => {
+ setInterval(() => {
+ setMeterLevel(props.source.getMeter().getPeaks().current[0]);
+ }, 50);
+ }, []);
+
+ let availabileSinks = getApp()
+ .getAudioManager()
+ .getSinks()
+ .filter((sink) => !props.source.getConnectedTo().includes(sink));
+
+ return (
+
+
+
{props.source.getName()}
+ {!(props.source instanceof MicrophoneSource) && (
+
{
+ getApp().getAudioManager().removeSource(props.source);
+ }}
+ >
+
+
+ )}
+
+
+
+ {props.source instanceof FileSource && (
+
+
{
+ if (props.source instanceof FileSource) props.source.getPlaying() ? props.source.stop() : props.source.play();
+ }}
+ tooltip="Play file"
+ >
+
0 ? (props.source.getCurrentPosition() / props.source.getDuration()) * 100 : 0}
+ onChange={(ev) => {
+ if (props.source instanceof FileSource) props.source.setCurrentPosition(parseFloat(ev.currentTarget.value));
+ }}
+ className="my-auto"
+ />
+ {
+ if (props.source instanceof FileSource) props.source.setLooping(!props.source.getLooping());
+ }}
+ tooltip="Loop"
+ >
+
+ )}
+
+
+
+
+
+
+
{
+ props.source.setVolume(parseFloat(ev.currentTarget.value) / 100);
+ }}
+ className="absolute top-[18px]"
+ />
+
+
+ {Math.round(props.source.getVolume() * 100)}
+
+
+
+
+
Connected to:
+
+ {props.source.getConnectedTo().map((sink) => {
+ return (
+
+
+ {sink.getName()}
+ props.source.disconnect(sink)}>
+
+ );
+ })}
+
+ {availabileSinks.length > 0 && (
+
+ {availabileSinks.map((sink) => {
+ return (
+ {
+ props.source.connect(sink);
+ }}
+ >
+ {sink.getName()}
+
+ );
+ })}
+
+ )}
+
+ );
+}
diff --git a/frontend/react/src/ui/ui.tsx b/frontend/react/src/ui/ui.tsx
index 143b03de..b3960178 100644
--- a/frontend/react/src/ui/ui.tsx
+++ b/frontend/react/src/ui/ui.tsx
@@ -134,14 +134,6 @@ export function UI() {
setLoginModalVisible(false);
}
- /* Temporary during devel */
- //useEffect(() => {
- // window.setTimeout(() => {
- // checkPassword("admin");
- // connect("devel");
- // }, 1000)
- //}, [])
-
return (
{
+ return frequenciesData.concat([...doubleToByteArray(data.frequency)], [data.modulation], [data.encryption]);
+ })
+
+ // Encode unitID, packetID, hops
+ let encUnitID: number[] = integerToByteArray(this.#unitID, 4);
+ let encPacketID: number[] = integerToByteArray(this.#packetID, 8);
+ let encHops: number[] = [this.#hops];
+
+ // Assemble packet
+ let encodedData: number[] = ([] as number[]).concat(
+ header,
+ [...this.#audioData],
+ frequenciesData,
+ encUnitID,
+ encPacketID,
+ encHops,
+ [...Buffer.from(this.#transmissionGUID, "utf-8")],
+ [...Buffer.from(this.#clientGUID, "utf-8")]
+ );
+
+ if (this.#latitude !== undefined && this.#longitude !== undefined && this.#altitude !== undefined) {
+ encodedData.concat(
+ [...doubleToByteArray(this.#latitude)],
+ [...doubleToByteArray(this.#longitude)],
+ [...doubleToByteArray(this.#altitude)]
+ );
+ }
+
+ // Set the lengths of the parts
+ let encPacketLen = integerToByteArray(encodedData.length, 2);
+ encodedData[0] = encPacketLen[0];
+ encodedData[1] = encPacketLen[1];
+
+ let encAudioLen = integerToByteArray(this.#audioData.length, 2);
+ encodedData[2] = encAudioLen[0];
+ encodedData[3] = encAudioLen[1];
+
+ let frequencyAudioLen = integerToByteArray(frequenciesData.length, 2);
+ encodedData[4] = frequencyAudioLen[0];
+ encodedData[5] = frequencyAudioLen[1];
+
+ this.#encodedData = new Uint8Array([0].concat(encodedData));
+ }
+}
diff --git a/frontend/server/src/audio/srshandler.ts b/frontend/server/src/audio/srshandler.ts
index 577a6e29..21d81cb4 100644
--- a/frontend/server/src/audio/srshandler.ts
+++ b/frontend/server/src/audio/srshandler.ts
@@ -1,7 +1,13 @@
import { defaultSRSData } from "./defaultdata";
+
const { OpusEncoder } = require("@discordjs/opus");
const encoder = new OpusEncoder(16000, 1);
+let decoder = null;
+import('opus-decoder').then((res) => {
+ decoder = new res.OpusDecoder();
+});
+
var net = require("net");
var bufferString = "";
@@ -117,6 +123,7 @@ export class SRSHandler {
let offset = 6 + audioLength + frequenciesLength;
if (modulation == 255) {
+ packetUint8Array = packetUint8Array.slice(0, -24) // Remove position data
packetUint8Array[6 + audioLength + 8] = 2;
this.clients.forEach((client) => {
getBytes(client.RadioInfo.unitId, 4).forEach((value, idx) => {
diff --git a/frontend/server/src/utils.ts b/frontend/server/src/utils.ts
new file mode 100644
index 00000000..da095138
--- /dev/null
+++ b/frontend/server/src/utils.ts
@@ -0,0 +1,30 @@
+export function byteArrayToInteger(array) {
+ let res = 0;
+ for (let i = 0; i < array.length; i++) {
+ res = res << 8;
+ res += array[array.length - i - 1];
+ }
+ return res;
+}
+
+export function integerToByteArray(value, length) {
+ let res: number[] = [];
+ for (let i = 0; i < length; i++) {
+ res.push(value & 255);
+ value = value >> 8;
+ }
+ return res;
+}
+
+export function doubleToByteArray(number) {
+ var buffer = new ArrayBuffer(8); // JS numbers are 8 bytes long, or 64 bits
+ var longNum = new Float64Array(buffer); // so equivalent to Float64
+
+ longNum[0] = number;
+
+ return Array.from(new Uint8Array(buffer));
+}
+
+export function byteArrayToDouble(array) {
+ return new DataView(array.reverse().buffer).getFloat64(0);
+}
diff --git a/frontend/server/tsconfig.json b/frontend/server/tsconfig.json
index 24dfd8c7..e5a37c12 100644
--- a/frontend/server/tsconfig.json
+++ b/frontend/server/tsconfig.json
@@ -2,7 +2,7 @@
"compilerOptions": {
"outDir": "./build",
"allowJs": true,
- "target": "es5",
+ "target": "ES2023",
"module": "Node16",
"moduleResolution": "Node16"
},