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:
@@ -3,7 +3,7 @@ plugins {
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.ts3client.android.audio"
|
||||
namespace = "eu.lixko.ts3j.client.android.audio"
|
||||
compileSdk = 37
|
||||
ndkVersion = "30.0.16248370"
|
||||
|
||||
|
||||
@@ -206,7 +206,7 @@ thread_local std::vector<int16_t> scratch;
|
||||
extern "C" {
|
||||
|
||||
JNIEXPORT jlong JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeOpen(JNIEnv *env, jclass, jboolean input, jint deviceId,
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeOpen(JNIEnv *env, jclass, jboolean input, jint deviceId,
|
||||
jint channels, jint preset, jint usage) {
|
||||
auto *created = new AudioLine(input, deviceId, channels, preset, usage);
|
||||
oboe::Result result = created->open();
|
||||
@@ -219,12 +219,12 @@ Java_com_ts3client_android_audio_OboeLine_nativeOpen(JNIEnv *env, jclass, jboole
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeChannels(JNIEnv *, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeChannels(JNIEnv *, jclass, jlong handle) {
|
||||
return line(handle)->channels();
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeStart(JNIEnv *env, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeStart(JNIEnv *env, jclass, jlong handle) {
|
||||
oboe::Result result = line(handle)->start();
|
||||
if (result != oboe::Result::OK) {
|
||||
env->ThrowNew(env->FindClass("java/lang/IllegalStateException"), oboe::convertToText(result));
|
||||
@@ -232,7 +232,7 @@ Java_com_ts3client_android_audio_OboeLine_nativeStart(JNIEnv *env, jclass, jlong
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeReopen(JNIEnv *env, jclass, jlong handle, jint deviceId,
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeReopen(JNIEnv *env, jclass, jlong handle, jint deviceId,
|
||||
jint preset, jint usage) {
|
||||
oboe::Result result = line(handle)->reopen(deviceId, preset, usage);
|
||||
if (result != oboe::Result::OK && result != oboe::Result::ErrorClosed) {
|
||||
@@ -241,7 +241,7 @@ Java_com_ts3client_android_audio_OboeLine_nativeReopen(JNIEnv *env, jclass, jlon
|
||||
}
|
||||
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeRead(JNIEnv *env, jclass, jlong handle, jbyteArray buffer,
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeRead(JNIEnv *env, jclass, jlong handle, jbyteArray buffer,
|
||||
jint offset, jint length) {
|
||||
size_t samples = static_cast<size_t>(length) / sizeof(int16_t);
|
||||
scratch.resize(samples);
|
||||
@@ -252,7 +252,7 @@ Java_com_ts3client_android_audio_OboeLine_nativeRead(JNIEnv *env, jclass, jlong
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeWrite(JNIEnv *env, jclass, jlong handle, jbyteArray buffer,
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeWrite(JNIEnv *env, jclass, jlong handle, jbyteArray buffer,
|
||||
jint offset, jint length) {
|
||||
size_t samples = static_cast<size_t>(length) / sizeof(int16_t);
|
||||
scratch.resize(samples);
|
||||
@@ -262,12 +262,12 @@ Java_com_ts3client_android_audio_OboeLine_nativeWrite(JNIEnv *env, jclass, jlong
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeClose(JNIEnv *, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeClose(JNIEnv *, jclass, jlong handle) {
|
||||
line(handle)->close();
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_OboeLine_nativeDelete(JNIEnv *, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_OboeLine_nativeDelete(JNIEnv *, jclass, jlong handle) {
|
||||
delete line(handle);
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ OpusDecoder *decoder(jlong handle) { return reinterpret_cast<OpusDecoder *>(hand
|
||||
extern "C" {
|
||||
|
||||
JNIEXPORT jlong JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_encoderCreate(JNIEnv *env, jclass, jint sampleRate, jint channels,
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_encoderCreate(JNIEnv *env, jclass, jint sampleRate, jint channels,
|
||||
jint application) {
|
||||
int error = OPUS_OK;
|
||||
OpusEncoder *created = opus_encoder_create(sampleRate, channels, application, &error);
|
||||
@@ -36,14 +36,14 @@ Java_com_ts3client_android_audio_NativeOpus_encoderCreate(JNIEnv *env, jclass, j
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_encoderCtl(JNIEnv *env, jclass, jlong handle, jint request,
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_encoderCtl(JNIEnv *env, jclass, jlong handle, jint request,
|
||||
jint value) {
|
||||
int result = opus_encoder_ctl(encoder(handle), request, value);
|
||||
if (result < 0) throwOpus(env, "opus_encoder_ctl", result);
|
||||
}
|
||||
|
||||
JNIEXPORT jbyteArray JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_encode(JNIEnv *env, jclass, jlong handle, jfloatArray pcm,
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_encode(JNIEnv *env, jclass, jlong handle, jfloatArray pcm,
|
||||
jint frameSize) {
|
||||
unsigned char packet[kMaxPacketBytes];
|
||||
jfloat *samples = env->GetFloatArrayElements(pcm, nullptr);
|
||||
@@ -59,12 +59,12 @@ Java_com_ts3client_android_audio_NativeOpus_encode(JNIEnv *env, jclass, jlong ha
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_encoderDestroy(JNIEnv *, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_encoderDestroy(JNIEnv *, jclass, jlong handle) {
|
||||
opus_encoder_destroy(encoder(handle));
|
||||
}
|
||||
|
||||
JNIEXPORT jlong JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_decoderCreate(JNIEnv *env, jclass, jint sampleRate, jint channels) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_decoderCreate(JNIEnv *env, jclass, jint sampleRate, jint channels) {
|
||||
int error = OPUS_OK;
|
||||
OpusDecoder *created = opus_decoder_create(sampleRate, channels, &error);
|
||||
if (error != OPUS_OK) {
|
||||
@@ -79,7 +79,7 @@ Java_com_ts3client_android_audio_NativeOpus_decoderCreate(JNIEnv *env, jclass, j
|
||||
* rebuilds the packet before {@code packet} from its error correction copy.
|
||||
*/
|
||||
JNIEXPORT jint JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_decode(JNIEnv *env, jclass, jlong handle, jbyteArray packet,
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_decode(JNIEnv *env, jclass, jlong handle, jbyteArray packet,
|
||||
jfloatArray out, jint frameSize, jboolean fec) {
|
||||
std::vector<unsigned char> data;
|
||||
if (packet != nullptr) {
|
||||
@@ -95,17 +95,17 @@ Java_com_ts3client_android_audio_NativeOpus_decode(JNIEnv *env, jclass, jlong ha
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_decoderReset(JNIEnv *, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_decoderReset(JNIEnv *, jclass, jlong handle) {
|
||||
opus_decoder_ctl(decoder(handle), OPUS_RESET_STATE);
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_decoderDestroy(JNIEnv *, jclass, jlong handle) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_decoderDestroy(JNIEnv *, jclass, jlong handle) {
|
||||
opus_decoder_destroy(decoder(handle));
|
||||
}
|
||||
|
||||
JNIEXPORT jstring JNICALL
|
||||
Java_com_ts3client_android_audio_NativeOpus_version0(JNIEnv *env, jclass) {
|
||||
Java_eu_lixko_ts3j_client_android_audio_NativeOpus_version0(JNIEnv *env, jclass) {
|
||||
return env->NewStringUTF(opus_get_version_string());
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -1,11 +1,11 @@
|
||||
package com.ts3client.android.audio;
|
||||
package eu.lixko.ts3j.client.android.audio;
|
||||
|
||||
import android.content.Context;
|
||||
|
||||
import com.ts3client.audio.AudioBackend;
|
||||
import com.ts3client.audio.AudioIo;
|
||||
import com.ts3client.audio.StreamingVoiceOutput;
|
||||
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.opus.OpusCodec;
|
||||
|
||||
/** Android's audio stack: Oboe for the devices, libopus built with the NDK. */
|
||||
public final class AndroidAudioBackend implements AudioBackend {
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.android.audio;
|
||||
package eu.lixko.ts3j.client.android.audio;
|
||||
|
||||
import android.content.Context;
|
||||
import android.media.AudioDeviceCallback;
|
||||
@@ -7,10 +7,10 @@ import android.media.AudioManager;
|
||||
import android.os.Handler;
|
||||
import android.os.Looper;
|
||||
|
||||
import com.ts3client.audio.AudioCapture;
|
||||
import com.ts3client.audio.AudioDevice;
|
||||
import com.ts3client.audio.AudioIo;
|
||||
import com.ts3client.audio.AudioPlayback;
|
||||
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 java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package com.ts3client.android.audio;
|
||||
package eu.lixko.ts3j.client.android.audio;
|
||||
|
||||
/**
|
||||
* How the app's audio meets Android's: which processing the platform applies to the
|
||||
+6
-6
@@ -1,10 +1,10 @@
|
||||
package com.ts3client.android.audio;
|
||||
package eu.lixko.ts3j.client.android.audio;
|
||||
|
||||
import com.ts3client.audio.opus.CtlOpusEncoder;
|
||||
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.CtlOpusEncoder;
|
||||
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;
|
||||
|
||||
/** libopus, built into the app with the NDK. */
|
||||
public final class NativeOpus implements OpusCodec {
|
||||
+3
-3
@@ -1,7 +1,7 @@
|
||||
package com.ts3client.android.audio;
|
||||
package eu.lixko.ts3j.client.android.audio;
|
||||
|
||||
import com.ts3client.audio.AudioCapture;
|
||||
import com.ts3client.audio.AudioPlayback;
|
||||
import eu.lixko.ts3j.client.audio.AudioCapture;
|
||||
import eu.lixko.ts3j.client.audio.AudioPlayback;
|
||||
|
||||
/**
|
||||
* An Oboe stream, as either an {@link AudioCapture} or an {@link AudioPlayback}. The native
|
||||
Reference in New Issue
Block a user