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:
2026-10-10 14:43:34 +00:00
co-authored by Claude Opus 5.5
parent 1a762c2689
commit 78fc45f9b2
920 changed files with 69645 additions and 69645 deletions
+3 -3
View File
@@ -37,7 +37,7 @@ abstract class BundleSoundPacks : DefaultTask() {
}
exec.javaexec {
classpath = encoder
mainClass.set("com.ts3client.audio.desktop.EncodeSoundPacks")
mainClass.set("eu.lixko.ts3j.client.audio.desktop.EncodeSoundPacks")
jvmArgs("--enable-native-access=ALL-UNNAMED")
args(source.path, File(out, "sound").path)
}
@@ -77,12 +77,12 @@ val releaseKeystore = rootDir.resolve("keystore.properties").takeIf { it.isFile
}
android {
namespace = "com.ts3client.android"
namespace = "eu.lixko.ts3j.client.android"
compileSdk = 37
ndkVersion = "30.0.16248370"
defaultConfig {
applicationId = "com.ts3client.android"
applicationId = "eu.lixko.ts3j.client"
minSdk = 33
targetSdk = 36
versionCode = 1
+1 -1
View File
@@ -2,7 +2,7 @@
-dontwarn javax.naming.**
# Reached from native code by name.
-keepclasseswithmembernames class com.ts3client.android.audio.** {
-keepclasseswithmembernames class eu.lixko.ts3j.client.android.audio.** {
native <methods>;
}
@@ -1,7 +1,7 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import com.ts3client.android.audio.AudioRoute
import eu.lixko.ts3j.client.android.audio.AudioRoute
/** Where the Android-only audio choices are kept; the rest live in the shared settings. */
class AudioRoutePrefs(context: Context) {
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.content.Intent
@@ -9,8 +9,8 @@ import android.graphics.BitmapFactory
import android.graphics.Canvas
import android.graphics.Rect
import android.graphics.drawable.Icon
import com.ts3client.config.Bookmark
import com.ts3client.net.IconRepository
import eu.lixko.ts3j.client.config.Bookmark
import eu.lixko.ts3j.client.net.IconRepository
/**
* Home-screen shortcuts that connect to a bookmark in one tap. A shortcut names its bookmark by
@@ -67,7 +67,7 @@ internal class BookmarkShortcuts(private val context: Context, private val icons
}
companion object {
const val ACTION_CONNECT = "com.ts3client.android.CONNECT_BOOKMARK"
const val ACTION_CONNECT = "eu.lixko.ts3j.client.android.CONNECT_BOOKMARK"
const val EXTRA_BOOKMARK = "bookmark"
/** 108 dp at xxxhdpi; the inner 72 dp always shows, the art sits well within. */
@@ -1,8 +1,8 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import androidx.compose.runtime.Immutable
import com.ts3client.text.HtmlText
import com.ts3client.text.TextQuery
import eu.lixko.ts3j.client.text.HtmlText
import eu.lixko.ts3j.client.text.TextQuery
/** Which conversation a chat line belongs to. */
sealed interface ChatKey {
@@ -11,7 +11,7 @@ sealed interface ChatKey {
data class Private(val clientId: Int) : ChatKey
}
/** One entry of a chat, as HTML in the form [com.ts3client.text.ChatHtml] writes. */
/** One entry of a chat, as HTML in the form [eu.lixko.ts3j.client.text.ChatHtml] writes. */
@Immutable
data class ChatLine(val id: Long, val html: String) {
/** The text to find in. */
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.Manifest
import android.app.Notification
@@ -17,9 +17,9 @@ import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
import com.ts3client.config.Settings
import com.ts3client.net.ClientStatus
import com.ts3client.session.SelfState
import eu.lixko.ts3j.client.config.Settings
import eu.lixko.ts3j.client.net.ClientStatus
import eu.lixko.ts3j.client.session.SelfState
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.conflate
import kotlinx.coroutines.flow.drop
@@ -231,8 +231,8 @@ class ConnectionService : LifecycleService() {
const val MIN_UPDATE_MS = 250L
const val STATUS_ICON_DP = 24
const val LARGE_ICON_DP = 48
const val ACTION_TOGGLE_MUTE = "com.ts3client.android.TOGGLE_MUTE"
const val ACTION_TOGGLE_DEAFEN = "com.ts3client.android.TOGGLE_DEAFEN"
const val ACTION_DISCONNECT = "com.ts3client.android.DISCONNECT"
const val ACTION_TOGGLE_MUTE = "eu.lixko.ts3j.client.android.TOGGLE_MUTE"
const val ACTION_TOGGLE_DEAFEN = "eu.lixko.ts3j.client.android.TOGGLE_DEAFEN"
const val ACTION_DISCONNECT = "eu.lixko.ts3j.client.android.DISCONNECT"
}
}
@@ -1,11 +1,11 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.net.Uri
import android.provider.OpenableColumns
import com.ts3client.net.TeamspeakConnection
import com.ts3client.net.filetransfer.FileTransfer
import com.ts3client.net.filetransfer.RemoteFile
import eu.lixko.ts3j.client.net.TeamspeakConnection
import eu.lixko.ts3j.client.net.filetransfer.FileTransfer
import eu.lixko.ts3j.client.net.filetransfer.RemoteFile
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.graphics.Bitmap
@@ -11,10 +11,10 @@ import android.provider.OpenableColumns
import android.util.LruCache
import com.caverock.androidsvg.RenderOptions
import com.caverock.androidsvg.SVG
import com.ts3client.config.AppDirs
import com.ts3client.config.Settings
import com.ts3client.gfx.IconPack
import com.ts3client.gfx.IconPacks
import eu.lixko.ts3j.client.config.AppDirs
import eu.lixko.ts3j.client.config.Settings
import eu.lixko.ts3j.client.gfx.IconPack
import eu.lixko.ts3j.client.gfx.IconPacks
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import java.io.File
@@ -1,13 +1,13 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.net.Uri
import com.ts3client.config.Bookmarks
import com.ts3client.config.IdentityEntry
import com.ts3client.config.IdentityStore
import com.ts3client.config.Settings
import com.ts3client.teamspeak.TeamSpeakImporter
import com.ts3client.teamspeak.TeamSpeakSettingsDb
import eu.lixko.ts3j.client.config.Bookmarks
import eu.lixko.ts3j.client.config.IdentityEntry
import eu.lixko.ts3j.client.config.IdentityStore
import eu.lixko.ts3j.client.config.Settings
import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter
import eu.lixko.ts3j.client.teamspeak.TeamSpeakSettingsDb
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
@@ -1,9 +1,9 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import com.ts3client.audio.AudioBackend
import com.ts3client.audio.InputLevel
import com.ts3client.audio.VoiceInput
import com.ts3client.config.Settings
import eu.lixko.ts3j.client.audio.AudioBackend
import eu.lixko.ts3j.client.audio.InputLevel
import eu.lixko.ts3j.client.audio.VoiceInput
import eu.lixko.ts3j.client.config.Settings
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.net.Uri
@@ -1,13 +1,13 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Intent
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import com.ts3client.android.ui.App
import com.ts3client.android.ui.Ts3Theme
import com.ts3client.session.ServerLink
import eu.lixko.ts3j.client.android.ui.App
import eu.lixko.ts3j.client.android.ui.Ts3Theme
import eu.lixko.ts3j.client.session.ServerLink
class MainActivity : ComponentActivity() {
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.app.Notification
import android.app.NotificationChannel
@@ -129,8 +129,8 @@ class MessageNotifier(private val context: Context) {
companion object {
/** The server and the client id of the private chat a notification opens or replies to. */
const val EXTRA_SERVER = "com.ts3client.android.SERVER"
const val EXTRA_CHAT = "com.ts3client.android.CHAT"
const val EXTRA_SERVER = "eu.lixko.ts3j.client.android.SERVER"
const val EXTRA_CHAT = "eu.lixko.ts3j.client.android.CHAT"
const val KEY_REPLY = "reply"
private const val MESSAGES = "messages"
private const val POKES = "pokes"
@@ -1,9 +1,9 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.net.ConnectivityManager
import android.net.Network
import com.ts3client.session.ServerSession
import eu.lixko.ts3j.client.session.ServerSession
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.graphics.ImageDecoder
import android.graphics.drawable.AnimatedImageDrawable
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.annotation.SuppressLint
import android.content.Context
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.app.RemoteInput
import android.content.BroadcastReceiver
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.ContentValues
import android.content.Context
@@ -1,23 +1,23 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.net.Uri
import com.ts3client.config.Bookmark
import com.ts3client.contacts.ContactType
import com.ts3client.config.WhisperList
import com.ts3client.net.ChannelNode
import com.ts3client.net.ClientEntry
import com.ts3client.net.ChannelSettings
import com.ts3client.net.ConnectionStats
import com.ts3client.net.Details
import com.ts3client.net.GroupChoice
import com.ts3client.net.Whisper
import com.ts3client.net.ban.BanEntry
import com.ts3client.net.ban.BanRule
import com.ts3client.net.filetransfer.RemoteFile
import com.ts3client.net.ConnectionListener.ChatScope
import com.ts3client.session.ServerLink
import com.ts3client.session.ServerSession
import com.ts3client.text.ChatHtml
import eu.lixko.ts3j.client.config.Bookmark
import eu.lixko.ts3j.client.contacts.ContactType
import eu.lixko.ts3j.client.config.WhisperList
import eu.lixko.ts3j.client.net.ChannelNode
import eu.lixko.ts3j.client.net.ClientEntry
import eu.lixko.ts3j.client.net.ChannelSettings
import eu.lixko.ts3j.client.net.ConnectionStats
import eu.lixko.ts3j.client.net.Details
import eu.lixko.ts3j.client.net.GroupChoice
import eu.lixko.ts3j.client.net.Whisper
import eu.lixko.ts3j.client.net.ban.BanEntry
import eu.lixko.ts3j.client.net.ban.BanRule
import eu.lixko.ts3j.client.net.filetransfer.RemoteFile
import eu.lixko.ts3j.client.net.ConnectionListener.ChatScope
import eu.lixko.ts3j.client.session.ServerLink
import eu.lixko.ts3j.client.session.ServerSession
import eu.lixko.ts3j.client.text.ChatHtml
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
@@ -1,9 +1,9 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.graphics.BitmapFactory
import androidx.compose.ui.graphics.ImageBitmap
import androidx.compose.ui.graphics.asImageBitmap
import com.ts3client.net.TeamspeakConnection
import eu.lixko.ts3j.client.net.TeamspeakConnection
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.update
@@ -1,16 +1,16 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import androidx.compose.runtime.Immutable
import com.ts3client.config.ClientRowColors
import com.ts3client.contacts.ContactStore
import com.ts3client.contacts.ContactType
import com.ts3client.net.ChannelNode
import com.ts3client.net.ClientEntry
import com.ts3client.net.ClientStatus
import com.ts3client.net.ServerModel
import com.ts3client.net.Spacers
import com.ts3client.net.TreeMatch
import com.ts3client.text.TextQuery
import eu.lixko.ts3j.client.config.ClientRowColors
import eu.lixko.ts3j.client.contacts.ContactStore
import eu.lixko.ts3j.client.contacts.ContactType
import eu.lixko.ts3j.client.net.ChannelNode
import eu.lixko.ts3j.client.net.ClientEntry
import eu.lixko.ts3j.client.net.ClientStatus
import eu.lixko.ts3j.client.net.ServerModel
import eu.lixko.ts3j.client.net.Spacers
import eu.lixko.ts3j.client.net.TreeMatch
import eu.lixko.ts3j.client.text.TextQuery
/**
* A copy of the channel tree taken at one moment. The model's own nodes change in place
@@ -1,4 +1,4 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.Manifest
import android.content.Context
@@ -8,34 +8,34 @@ import android.net.Uri
import android.os.Handler
import android.os.Looper
import android.provider.OpenableColumns
import com.ts3client.android.audio.AndroidAudioBackend
import com.ts3client.android.audio.AudioRoute
import com.ts3client.audio.AudioDevice
import com.ts3client.config.BanReasonPresets
import com.ts3client.config.Bookmark
import com.ts3client.config.Bookmarks
import com.ts3client.config.IdentityStore
import com.ts3client.config.Settings
import com.ts3client.config.WhisperList
import com.ts3client.config.WhisperLists
import com.ts3client.contacts.Contact
import com.ts3client.contacts.ContactStore
import com.ts3client.myts.ChatAttachment
import com.ts3client.myts.ChatAttachments
import com.ts3client.myts.MyTeamSpeak
import com.ts3client.myts.MyTeamSpeakLogin
import com.ts3client.net.HostButton
import com.ts3client.net.TeamspeakConnection
import com.ts3client.session.SelfState
import com.ts3client.session.ServerLink
import com.ts3client.session.ServerSession
import com.ts3client.session.Sessions
import com.ts3client.sound.SoundNotifier
import com.ts3client.sound.SoundPack
import com.ts3client.teamspeak.SyncItem
import com.ts3client.teamspeak.TeamSpeakImporter
import com.ts3client.teamspeak.TeamSpeakSettingsDb
import com.ts3client.text.BBCode
import eu.lixko.ts3j.client.android.audio.AndroidAudioBackend
import eu.lixko.ts3j.client.android.audio.AudioRoute
import eu.lixko.ts3j.client.audio.AudioDevice
import eu.lixko.ts3j.client.config.BanReasonPresets
import eu.lixko.ts3j.client.config.Bookmark
import eu.lixko.ts3j.client.config.Bookmarks
import eu.lixko.ts3j.client.config.IdentityStore
import eu.lixko.ts3j.client.config.Settings
import eu.lixko.ts3j.client.config.WhisperList
import eu.lixko.ts3j.client.config.WhisperLists
import eu.lixko.ts3j.client.contacts.Contact
import eu.lixko.ts3j.client.contacts.ContactStore
import eu.lixko.ts3j.client.myts.ChatAttachment
import eu.lixko.ts3j.client.myts.ChatAttachments
import eu.lixko.ts3j.client.myts.MyTeamSpeak
import eu.lixko.ts3j.client.myts.MyTeamSpeakLogin
import eu.lixko.ts3j.client.net.HostButton
import eu.lixko.ts3j.client.net.TeamspeakConnection
import eu.lixko.ts3j.client.session.SelfState
import eu.lixko.ts3j.client.session.ServerLink
import eu.lixko.ts3j.client.session.ServerSession
import eu.lixko.ts3j.client.session.Sessions
import eu.lixko.ts3j.client.sound.SoundNotifier
import eu.lixko.ts3j.client.sound.SoundPack
import eu.lixko.ts3j.client.teamspeak.SyncItem
import eu.lixko.ts3j.client.teamspeak.TeamSpeakImporter
import eu.lixko.ts3j.client.teamspeak.TeamSpeakSettingsDb
import eu.lixko.ts3j.client.text.BBCode
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
@@ -1,13 +1,13 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.content.res.AssetManager
import com.ts3client.config.AppDirs
import eu.lixko.ts3j.client.config.AppDirs
import java.io.File
/**
* Unpacks the sound packs bundled in the APK into the profile's `sound` folder, where
* [com.ts3client.sound.SoundNotifier] finds packs, as they are read as plain files.
* [eu.lixko.ts3j.client.sound.SoundNotifier] finds packs, as they are read as plain files.
* It happens once per installed version of the app; packs of other origins in the
* folder are left alone.
*/
@@ -1,9 +1,9 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.content.Context
import android.os.Bundle
import android.speech.tts.TextToSpeech
import com.ts3client.sound.SoundPlayer
import eu.lixko.ts3j.client.sound.SoundPlayer
/**
* Adds the phone's text-to-speech to a wave player, for packs that speak their
@@ -1,7 +1,7 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.app.Application
import com.ts3client.config.AppDirs
import eu.lixko.ts3j.client.config.AppDirs
class Ts3Application : Application() {
@@ -1,8 +1,8 @@
package com.ts3client.android
package eu.lixko.ts3j.client.android
import android.util.LruCache
import com.ts3client.config.Settings
import com.ts3client.net.PictureDownloads
import eu.lixko.ts3j.client.config.Settings
import eu.lixko.ts3j.client.net.PictureDownloads
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.Manifest
import android.content.pm.PackageManager
@@ -19,8 +19,8 @@ import androidx.compose.runtime.saveable.rememberSaveableStateHolder
import androidx.compose.runtime.setValue
import androidx.compose.ui.platform.LocalContext
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.SessionController
import com.ts3client.android.SessionEvent
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.android.SessionEvent
@Composable
fun App(vm: SessionController) {
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.app.Activity
import android.content.Context
@@ -17,11 +17,11 @@ import androidx.compose.runtime.rememberUpdatedState
import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.ChatKey
import com.ts3client.android.ServerController
import com.ts3client.android.SessionController
import com.ts3client.myts.ChatAttachment
import com.ts3client.myts.MyTsException
import eu.lixko.ts3j.client.android.ChatKey
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.myts.ChatAttachment
import eu.lixko.ts3j.client.myts.MyTsException
import kotlinx.coroutines.launch
import java.io.IOException
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -45,11 +45,11 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.ts3client.android.ServerController
import com.ts3client.config.BanReasonPresets
import com.ts3client.net.ban.BanEntry
import com.ts3client.net.ban.BanPattern
import com.ts3client.net.ban.BanRule
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.config.BanReasonPresets
import eu.lixko.ts3j.client.net.ban.BanEntry
import eu.lixko.ts3j.client.net.ban.BanPattern
import eu.lixko.ts3j.client.net.ban.BanRule
import kotlinx.coroutines.launch
import java.time.Instant
import java.time.ZoneId
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.clickable
@@ -32,8 +32,8 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.SessionController
import com.ts3client.config.Bookmark
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.config.Bookmark
/** A bookmark on the edit page: [index] among the saved ones, -1 for a new one. */
class BookmarkEdit(val index: Int, val bookmark: Bookmark)
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
@@ -29,9 +29,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
import com.ts3client.android.ServerController
import com.ts3client.net.ChannelCodec
import com.ts3client.net.ChannelSettings
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.net.ChannelCodec
import eu.lixko.ts3j.client.net.ChannelSettings
import kotlinx.coroutines.launch
import kotlin.math.roundToInt
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.AnimatedVisibility
@@ -53,12 +53,12 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.ts3client.android.ChannelItem
import com.ts3client.android.ClientItem
import com.ts3client.android.ServerTree
import com.ts3client.contacts.ContactType
import com.ts3client.gfx.IconKeys
import com.ts3client.net.ClientStatus
import eu.lixko.ts3j.client.android.ChannelItem
import eu.lixko.ts3j.client.android.ClientItem
import eu.lixko.ts3j.client.android.ServerTree
import eu.lixko.ts3j.client.contacts.ContactType
import eu.lixko.ts3j.client.gfx.IconKeys
import eu.lixko.ts3j.client.net.ClientStatus
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.first
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -47,12 +47,12 @@ import androidx.compose.ui.input.key.type
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.ts3client.android.ChatKey
import com.ts3client.android.ChatLine
import com.ts3client.android.ChatMatch
import com.ts3client.android.Chats
import com.ts3client.android.Conversation
import com.ts3client.text.TextQuery
import eu.lixko.ts3j.client.android.ChatKey
import eu.lixko.ts3j.client.android.ChatLine
import eu.lixko.ts3j.client.android.ChatMatch
import eu.lixko.ts3j.client.android.Chats
import eu.lixko.ts3j.client.android.Conversation
import eu.lixko.ts3j.client.text.TextQuery
import kotlinx.coroutines.flow.first
@Composable
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
@@ -30,14 +30,14 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.fromHtml
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.WebPictures
import com.ts3client.myts.ChatAttachment
import com.ts3client.text.BBCode
import com.ts3client.text.ChatHtml
import com.ts3client.text.TextQuery
import eu.lixko.ts3j.client.android.WebPictures
import eu.lixko.ts3j.client.myts.ChatAttachment
import eu.lixko.ts3j.client.text.BBCode
import eu.lixko.ts3j.client.text.ChatHtml
import eu.lixko.ts3j.client.text.TextQuery
/**
* HTML as [BBCode][com.ts3client.text.BBCode] and [ChatHtml] write it, with its rules as dividers
* HTML as [BBCode][eu.lixko.ts3j.client.text.BBCode] and [ChatHtml] write it, with its rules as dividers
* and its pictures fetched from the web: Android's HTML parser shows neither, so the text is
* split at them.
*/
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.graphics.BitmapFactory
import androidx.activity.compose.BackHandler
@@ -54,10 +54,10 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.IdentityInfo
import com.ts3client.android.SessionController
import com.ts3client.config.Bookmark
import com.ts3client.net.IconRepository
import eu.lixko.ts3j.client.android.IdentityInfo
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.config.Bookmark
import eu.lixko.ts3j.client.net.IconRepository
/** Where to connect to: an address typed in, or a bookmark. */
@OptIn(ExperimentalMaterial3Api::class)
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.content.ClipData
import android.content.ClipboardManager
@@ -31,10 +31,10 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.font.FontStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.ts3client.android.ClientItem
import com.ts3client.android.ServerController
import com.ts3client.net.ConnectionStats
import com.ts3client.net.ConnectionStatsFormat
import eu.lixko.ts3j.client.android.ClientItem
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.net.ConnectionStats
import eu.lixko.ts3j.client.net.ConnectionStatsFormat
import kotlinx.coroutines.delay
private const val REFRESH_MS = 1000L
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.content.ClipData
import android.content.ClipboardManager
@@ -40,11 +40,11 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.SessionController
import com.ts3client.contacts.Contact
import com.ts3client.contacts.ContactDefaults
import com.ts3client.contacts.ContactType
import com.ts3client.contacts.NicknameDisplay
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.contacts.Contact
import eu.lixko.ts3j.client.contacts.ContactDefaults
import eu.lixko.ts3j.client.contacts.ContactType
import eu.lixko.ts3j.client.contacts.NicknameDisplay
import kotlinx.coroutines.launch
import java.time.format.DateTimeFormatter
import kotlin.math.roundToInt
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.animation.animateContentSize
import androidx.compose.foundation.background
@@ -34,8 +34,8 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.ts3client.net.Details
import com.ts3client.text.BBCode
import eu.lixko.ts3j.client.net.Details
import eu.lixko.ts3j.client.text.BBCode
/**
* The facts of the server, a channel or a client, then its description, for the top of its sheet.
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.text.format.DateUtils
import android.text.format.Formatter
@@ -46,10 +46,10 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.ServerController
import com.ts3client.android.TransferRow
import com.ts3client.net.filetransfer.FileTransfer
import com.ts3client.net.filetransfer.RemoteFile
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.android.TransferRow
import eu.lixko.ts3j.client.net.filetransfer.FileTransfer
import eu.lixko.ts3j.client.net.filetransfer.RemoteFile
import kotlinx.coroutines.launch
/** A channel's file repository: folders to walk, files to download, upload, rename and delete. */
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.padding
@@ -45,9 +45,9 @@ import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.unit.dp
import com.ts3client.gfx.IconKeys
import com.ts3client.net.ClientStatus
import com.ts3client.text.TextQuery
import eu.lixko.ts3j.client.gfx.IconKeys
import eu.lixko.ts3j.client.net.ClientStatus
import eu.lixko.ts3j.client.text.TextQuery
/** What the find bar holds: the text, how to match it, and whether it is [open]. */
@Stable
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
@@ -15,9 +15,9 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.Picture
import com.ts3client.android.WebPictures
import com.ts3client.net.HostButton
import eu.lixko.ts3j.client.android.Picture
import eu.lixko.ts3j.client.android.WebPictures
import eu.lixko.ts3j.client.net.HostButton
/**
* The server's host button in the top bar: its own picture fitted to the bar's icons, or
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.content.ClipData
import android.content.ClipboardManager
@@ -42,8 +42,8 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.IdentityInfo
import com.ts3client.android.IdentityManager
import eu.lixko.ts3j.client.android.IdentityInfo
import eu.lixko.ts3j.client.android.IdentityManager
import kotlinx.coroutines.launch
/** Beyond this a search takes years; TeamSpeak's own dialog stops there too. */
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
@@ -31,12 +31,12 @@ import androidx.compose.ui.draw.alpha
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import com.ts3client.android.ClientItem
import com.ts3client.android.ServerController
import com.ts3client.net.GroupChoice
import com.ts3client.net.TeamspeakConnection
import com.ts3client.net.ban.BanRule
import com.ts3client.net.ban.BanUnit
import eu.lixko.ts3j.client.android.ClientItem
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.net.GroupChoice
import eu.lixko.ts3j.client.net.TeamspeakConnection
import eu.lixko.ts3j.client.net.ban.BanRule
import eu.lixko.ts3j.client.net.ban.BanUnit
/** Asks to confirm a kick, with an optional reason. */
@Composable
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
@@ -41,11 +41,11 @@ import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.ts3client.android.SessionController
import com.ts3client.myts.AccountInfo
import com.ts3client.myts.MyTeamSpeak
import com.ts3client.myts.MyTsException
import com.ts3client.teamspeak.SyncItem
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.myts.AccountInfo
import eu.lixko.ts3j.client.myts.MyTeamSpeak
import eu.lixko.ts3j.client.myts.MyTsException
import eu.lixko.ts3j.client.teamspeak.SyncItem
import kotlinx.coroutines.launch
import java.io.IOException
import java.time.ZoneId
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
@@ -11,8 +11,8 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.ts3client.android.SessionController
import com.ts3client.config.Settings
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.config.Settings
import kotlin.math.abs
import kotlin.math.roundToInt
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Spacer
@@ -15,7 +15,7 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.IconTheme
import eu.lixko.ts3j.client.android.IconTheme
val LocalIconTheme = staticCompositionLocalOf<IconTheme> { error("No icon theme provided") }
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.content.ClipData
import android.content.ClipboardManager
@@ -44,10 +44,10 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.IntSize
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import com.ts3client.android.Picture
import com.ts3client.android.SavedPictures
import com.ts3client.android.ServerController
import com.ts3client.android.decodePicture
import eu.lixko.ts3j.client.android.Picture
import eu.lixko.ts3j.client.android.SavedPictures
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.android.decodePicture
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.gestures.awaitEachGesture
import androidx.compose.foundation.gestures.awaitFirstDown
@@ -20,11 +20,11 @@ import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.ServerController
import com.ts3client.android.ServerTree
import com.ts3client.android.SessionController
import com.ts3client.android.SessionState
import com.ts3client.net.ClientStatus
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.android.ServerTree
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.android.SessionState
import eu.lixko.ts3j.client.net.ClientStatus
import kotlinx.coroutines.flow.MutableStateFlow
/** What push-to-talk would talk on: the server holding the microphone, which need not be the one on screen. */
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.background
import androidx.compose.foundation.border
@@ -31,7 +31,7 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.ts3client.config.ClientRowColors
import eu.lixko.ts3j.client.config.ClientRowColors
/** A row background: none, a preset, or a custom colour. [argb] is 0 for none. */
@Composable
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.graphics.BitmapFactory
import android.graphics.drawable.AnimatedImageDrawable
@@ -31,10 +31,10 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.Picture
import com.ts3client.android.ServerImages
import com.ts3client.gfx.CountryFlags
import com.ts3client.net.IconRepository
import eu.lixko.ts3j.client.android.Picture
import eu.lixko.ts3j.client.android.ServerImages
import eu.lixko.ts3j.client.gfx.CountryFlags
import eu.lixko.ts3j.client.net.IconRepository
import java.util.Optional
import java.util.concurrent.ConcurrentHashMap
import kotlin.math.roundToInt
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.widget.Toast
import androidx.activity.compose.BackHandler
@@ -70,19 +70,19 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.LifecycleResumeEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.ChannelItem
import com.ts3client.android.ChatKey
import com.ts3client.android.ChatMatch
import com.ts3client.android.ServerController
import com.ts3client.android.SessionController
import com.ts3client.android.SessionState
import com.ts3client.android.TreeFind
import com.ts3client.android.findIn
import com.ts3client.config.Settings
import com.ts3client.config.WhisperList
import com.ts3client.myts.ChatAttachment
import com.ts3client.session.ServerLink
import com.ts3client.text.TsLink
import eu.lixko.ts3j.client.android.ChannelItem
import eu.lixko.ts3j.client.android.ChatKey
import eu.lixko.ts3j.client.android.ChatMatch
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.android.SessionState
import eu.lixko.ts3j.client.android.TreeFind
import eu.lixko.ts3j.client.android.findIn
import eu.lixko.ts3j.client.config.Settings
import eu.lixko.ts3j.client.config.WhisperList
import eu.lixko.ts3j.client.myts.ChatAttachment
import eu.lixko.ts3j.client.session.ServerLink
import eu.lixko.ts3j.client.text.TsLink
import kotlinx.coroutines.launch
private val ChatKeySaver = Saver<ChatKey, String>(
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.contract.ActivityResultContracts
@@ -16,8 +16,8 @@ import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.IconTheme
import com.ts3client.android.SessionController
import eu.lixko.ts3j.client.android.IconTheme
import eu.lixko.ts3j.client.android.SessionController
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
@@ -31,10 +31,10 @@ import androidx.compose.ui.unit.dp
import androidx.compose.foundation.clickable
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import com.ts3client.android.ChannelItem
import com.ts3client.android.ClientItem
import com.ts3client.contacts.ContactType
import com.ts3client.net.Details
import eu.lixko.ts3j.client.android.ChannelItem
import eu.lixko.ts3j.client.android.ClientItem
import eu.lixko.ts3j.client.contacts.ContactType
import eu.lixko.ts3j.client.net.Details
import kotlin.math.roundToInt
/** What can be done with a client: the private chat, a poke, a move, their volume, filing them as a contact. */
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import android.content.Intent
import android.net.Uri
@@ -30,12 +30,12 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.LifecycleStartEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.MicLevel
import com.ts3client.android.SessionController
import com.ts3client.android.audio.AudioRoute
import com.ts3client.audio.AudioDevice
import com.ts3client.audio.InputLevel
import com.ts3client.config.Settings
import eu.lixko.ts3j.client.android.MicLevel
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.android.audio.AudioRoute
import eu.lixko.ts3j.client.audio.AudioDevice
import eu.lixko.ts3j.client.audio.InputLevel
import eu.lixko.ts3j.client.config.Settings
import kotlin.math.roundToInt
private val DENOISE_LEVELS = listOf("Off", "6 dB", "12 dB", "18 dB", "21 dB")
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.material3.MaterialTheme
@@ -1,4 +1,4 @@
package com.ts3client.android.ui
package eu.lixko.ts3j.client.android.ui
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@@ -38,11 +38,11 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.ts3client.android.ServerController
import com.ts3client.android.SessionController
import com.ts3client.android.SessionState
import com.ts3client.config.WhisperList
import com.ts3client.net.Whisper
import eu.lixko.ts3j.client.android.ServerController
import eu.lixko.ts3j.client.android.SessionController
import eu.lixko.ts3j.client.android.SessionState
import eu.lixko.ts3j.client.config.WhisperList
import eu.lixko.ts3j.client.net.Whisper
/** Says the microphone whispers instead of talking in the channel, until stopped. */
@Composable
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">TS3J</string>
<string name="app_name">TeamSpook TS3j</string>
<string name="connection_channel">Connection</string>
<string name="messages_channel">Private messages</string>
<string name="pokes_channel">Pokes</string>
+1 -1
View File
@@ -3,7 +3,7 @@ plugins {
}
android {
namespace = "com.ts3client.android.audio"
namespace = "eu.lixko.ts3j.client.android.audio"
compileSdk = 37
ndkVersion = "30.0.16248370"
+8 -8
View File
@@ -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);
}
+9 -9
View File
@@ -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());
}
@@ -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 {
@@ -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,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
@@ -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 {
@@ -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