Rename to TeamSpook TS3j, package eu.lixko.ts3j.client
Java/Kotlin sources move from com.ts3client to eu.lixko.ts3j.client, and the Android application id becomes eu.lixko.ts3j.client. The product name shows as "TeamSpook TS3j" in window titles, the tray, the launcher entries, notifications and PipeWire streams. The desktop profile directory, WM_CLASS and ts3j.* system properties keep their names so existing settings and launchers carry on working. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
+9
-9
@@ -1,11 +1,11 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.AudioCapture;
|
||||
import com.ts3client.audio.AudioDevice;
|
||||
import com.ts3client.audio.AudioIo;
|
||||
import com.ts3client.audio.AudioPlayback;
|
||||
import com.ts3client.audio.VoiceFormat;
|
||||
import com.ts3client.audio.desktop.pipewire.PipeWire;
|
||||
import eu.lixko.ts3j.client.audio.AudioCapture;
|
||||
import eu.lixko.ts3j.client.audio.AudioDevice;
|
||||
import eu.lixko.ts3j.client.audio.AudioIo;
|
||||
import eu.lixko.ts3j.client.audio.AudioPlayback;
|
||||
import eu.lixko.ts3j.client.audio.VoiceFormat;
|
||||
import eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWire;
|
||||
|
||||
import javax.sound.sampled.AudioFormat;
|
||||
import javax.sound.sampled.AudioSystem;
|
||||
@@ -106,7 +106,7 @@ public final class AudioDevices implements AudioIo {
|
||||
throws LineUnavailableException {
|
||||
if (usePipeWire(deviceId)) {
|
||||
try {
|
||||
return PipeWire.openCapture("TS3J Microphone", pipeWireNode(deviceId),
|
||||
return PipeWire.openCapture("TeamSpook TS3j Microphone", pipeWireNode(deviceId),
|
||||
VoiceFormat.SAMPLE_RATE, clampChannels(preferredChannels));
|
||||
} catch (Exception e) {
|
||||
if (isPipeWireDevice(deviceId)) throw unavailable(true, deviceId, e);
|
||||
@@ -121,7 +121,7 @@ public final class AudioDevices implements AudioIo {
|
||||
throws LineUnavailableException {
|
||||
if (usePipeWire(deviceId)) {
|
||||
try {
|
||||
return PipeWire.openPlayback("TS3J Playback", pipeWireNode(deviceId),
|
||||
return PipeWire.openPlayback("TeamSpook TS3j Playback", pipeWireNode(deviceId),
|
||||
VoiceFormat.SAMPLE_RATE, clampChannels(preferredChannels));
|
||||
} catch (Exception e) {
|
||||
if (isPipeWireDevice(deviceId)) throw unavailable(false, deviceId, e);
|
||||
+6
-6
@@ -1,10 +1,10 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.AudioBackend;
|
||||
import com.ts3client.audio.AudioIo;
|
||||
import com.ts3client.audio.StreamingVoiceOutput;
|
||||
import com.ts3client.audio.desktop.pipewire.PipeWire;
|
||||
import com.ts3client.audio.opus.OpusCodec;
|
||||
import eu.lixko.ts3j.client.audio.AudioBackend;
|
||||
import eu.lixko.ts3j.client.audio.AudioIo;
|
||||
import eu.lixko.ts3j.client.audio.StreamingVoiceOutput;
|
||||
import eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWire;
|
||||
import eu.lixko.ts3j.client.audio.opus.OpusCodec;
|
||||
|
||||
/**
|
||||
* Desktop audio backend: PipeWire for capture/playback where it is running, Java Sound
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.sound.SoundPackConverter;
|
||||
import eu.lixko.ts3j.client.sound.SoundPackConverter;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.AudioCapture;
|
||||
import eu.lixko.ts3j.client.audio.AudioCapture;
|
||||
|
||||
import javax.sound.sampled.TargetDataLine;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.AudioPlayback;
|
||||
import eu.lixko.ts3j.client.audio.AudioPlayback;
|
||||
|
||||
import javax.sound.sampled.SourceDataLine;
|
||||
|
||||
+5
-5
@@ -1,9 +1,9 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.opus.LibOpus;
|
||||
import com.ts3client.audio.opus.OpusCodec;
|
||||
import com.ts3client.audio.opus.OpusDecoder;
|
||||
import com.ts3client.audio.opus.OpusEncoder;
|
||||
import eu.lixko.ts3j.client.audio.opus.LibOpus;
|
||||
import eu.lixko.ts3j.client.audio.opus.OpusCodec;
|
||||
import eu.lixko.ts3j.client.audio.opus.OpusDecoder;
|
||||
import eu.lixko.ts3j.client.audio.opus.OpusEncoder;
|
||||
|
||||
/** The system's (or the bundled) libopus, reached through the FFM API. */
|
||||
public final class NativeOpusCodec implements OpusCodec {
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.opus.LibOpus;
|
||||
import com.ts3client.audio.opus.OpusDecoder;
|
||||
import eu.lixko.ts3j.client.audio.opus.LibOpus;
|
||||
import eu.lixko.ts3j.client.audio.opus.OpusDecoder;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import com.ts3client.audio.opus.CtlOpusEncoder;
|
||||
import eu.lixko.ts3j.client.audio.opus.CtlOpusEncoder;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop;
|
||||
package eu.lixko.ts3j.client.audio.desktop;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import java.lang.foreign.MemorySegment;
|
||||
|
||||
+4
-4
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import com.ts3client.audio.AudioCapture;
|
||||
import com.ts3client.audio.AudioPlayback;
|
||||
import eu.lixko.ts3j.client.audio.AudioCapture;
|
||||
import eu.lixko.ts3j.client.audio.AudioPlayback;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -14,7 +14,7 @@ import java.util.List;
|
||||
* ordinary {@code pw_stream}s that appear individually in volume mixers.
|
||||
*
|
||||
* <p>Everything here is a no-op on a machine without PipeWire: {@link #isAvailable()}
|
||||
* reports {@code false} and {@link com.ts3client.audio.desktop.AudioDevices} falls back
|
||||
* reports {@code false} and {@link eu.lixko.ts3j.client.audio.desktop.AudioDevices} falls back
|
||||
* to Java Sound.
|
||||
*/
|
||||
public final class PipeWire {
|
||||
+3
-3
@@ -1,10 +1,10 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import com.ts3client.audio.AudioCapture;
|
||||
import eu.lixko.ts3j.client.audio.AudioCapture;
|
||||
|
||||
import java.lang.foreign.MemorySegment;
|
||||
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
|
||||
/** A PipeWire capture stream ({@code PW_DIRECTION_INPUT}). */
|
||||
final class PipeWireCapture extends PipeWireStream implements AudioCapture {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import java.lang.foreign.AddressLayout;
|
||||
import java.lang.foreign.Arena;
|
||||
+4
-4
@@ -1,11 +1,11 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import com.ts3client.audio.AudioPlayback;
|
||||
import eu.lixko.ts3j.client.audio.AudioPlayback;
|
||||
|
||||
import java.lang.foreign.MemorySegment;
|
||||
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.LONG;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.LONG;
|
||||
|
||||
/** A PipeWire playback stream ({@code PW_DIRECTION_OUTPUT}). */
|
||||
final class PipeWirePlayback extends PipeWireStream implements AudioPlayback {
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
@@ -11,8 +11,8 @@ import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.PTR;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.PTR;
|
||||
|
||||
/**
|
||||
* The process-wide connection to the PipeWire daemon.
|
||||
+4
-4
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
@@ -9,8 +9,8 @@ import java.lang.invoke.MethodType;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static com.ts3client.audio.desktop.pipewire.PipeWireLibrary.PTR;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.INT;
|
||||
import static eu.lixko.ts3j.client.audio.desktop.pipewire.PipeWireLibrary.PTR;
|
||||
|
||||
/**
|
||||
* One {@code pw_stream} plus the ring buffer that decouples it from the application.
|
||||
@@ -87,7 +87,7 @@ abstract class PipeWireStream {
|
||||
properties.put(PipeWireLibrary.KEY_MEDIA_TYPE, "Audio");
|
||||
properties.put(PipeWireLibrary.KEY_MEDIA_CATEGORY, capture ? "Capture" : "Playback");
|
||||
properties.put(PipeWireLibrary.KEY_MEDIA_ROLE, "Communication");
|
||||
properties.put(PipeWireLibrary.KEY_APP_NAME, "TS3J");
|
||||
properties.put(PipeWireLibrary.KEY_APP_NAME, "TeamSpook TS3j");
|
||||
properties.put(PipeWireLibrary.KEY_NODE_NAME, name);
|
||||
properties.put(PipeWireLibrary.KEY_NODE_LATENCY, QUANTUM + "/" + rate);
|
||||
properties.put(PipeWireLibrary.KEY_NODE_RATE, "1/" + rate);
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import java.lang.foreign.MemorySegment;
|
||||
import java.lang.foreign.SegmentAllocator;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.GlobalInputHook;
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.GlobalInputHook;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.GlobalInputHook;
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.GlobalInputHook;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileInputStream;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.GlobalInputHook;
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.GlobalInputHook;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.util.HashMap;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.lang.foreign.MemorySegment;
|
||||
import java.util.HashMap;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.GlobalInputHook;
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.GlobalInputHook;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.GlobalInputHook;
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.GlobalInputHook;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.MemorySegment;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.notify.desktop;
|
||||
package eu.lixko.ts3j.client.notify.desktop;
|
||||
|
||||
import java.io.EOFException;
|
||||
import java.io.IOException;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.notify.desktop;
|
||||
package eu.lixko.ts3j.client.notify.desktop;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.notify.desktop;
|
||||
package eu.lixko.ts3j.client.notify.desktop;
|
||||
|
||||
import java.util.function.Consumer;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.notify.desktop;
|
||||
package eu.lixko.ts3j.client.notify.desktop;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.audio.desktop.pipewire;
|
||||
package eu.lixko.ts3j.client.audio.desktop.pipewire;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.hotkey.desktop;
|
||||
package eu.lixko.ts3j.client.hotkey.desktop;
|
||||
|
||||
import com.ts3client.hotkey.HotkeyKey;
|
||||
import eu.lixko.ts3j.client.hotkey.HotkeyKey;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.notify.desktop;
|
||||
package eu.lixko.ts3j.client.notify.desktop;
|
||||
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.recording;
|
||||
package eu.lixko.ts3j.client.recording;
|
||||
|
||||
import java.lang.foreign.Arena;
|
||||
import java.lang.foreign.FunctionDescriptor;
|
||||
+5
-5
@@ -1,9 +1,9 @@
|
||||
package com.ts3client.recording;
|
||||
package eu.lixko.ts3j.client.recording;
|
||||
|
||||
import com.ts3client.audio.VoiceFormat;
|
||||
import com.ts3client.audio.desktop.NativeOpusCodec;
|
||||
import com.ts3client.audio.ogg.SelfDelimitedOpus;
|
||||
import com.ts3client.audio.opus.OpusEncoder;
|
||||
import eu.lixko.ts3j.client.audio.VoiceFormat;
|
||||
import eu.lixko.ts3j.client.audio.desktop.NativeOpusCodec;
|
||||
import eu.lixko.ts3j.client.audio.ogg.SelfDelimitedOpus;
|
||||
import eu.lixko.ts3j.client.audio.opus.OpusEncoder;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package com.ts3client.sound;
|
||||
package eu.lixko.ts3j.client.sound;
|
||||
|
||||
import com.ts3client.audio.desktop.NativeOpusCodec;
|
||||
import eu.lixko.ts3j.client.audio.desktop.NativeOpusCodec;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.junit.jupiter.api.io.TempDir;
|
||||
|
||||
Reference in New Issue
Block a user