Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-05-09 12:24:04 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorder netplay class

Browse Source 
Put all the boring settings at the bottom to reduce scrolling!
This commit is contained in:
Tom Pratt 2026-04-09 23:26:58 +02:00
parent 099243f2c6
commit bfa68bf935
1 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/netplay/Netplay.kt
View File

@ -27,9 +27,60 @@ object Netplay {
private val _connectionErrors = Channel<String>(Channel.BUFFERED)
val connectionErrors = _connectionErrors.receiveAsFlow()
suspend fun join(): Boolean = withContext(Dispatchers.IO) {
netPlayClientPointer = Join()
val isConnected = netPlayClientPointer != 0L && isClientConnected()
if (!isActive) {
releaseNetplayClient()
return@withContext false
}
if (isConnected) {
return@withContext true
}
releaseNetplayClient()
false
}
suspend fun quit() = withContext(Dispatchers.IO) {
releaseNetplayClient()
}
private fun releaseNetplayClient() {
if (netPlayClientPointer != 0L) {
ReleaseNetplayClient()
netPlayClientPointer = 0
}
_launchGame.flush()
_connectionErrors.flush()
}
@JvmStatic
private external fun Join(): Long
@JvmStatic
external fun isClientConnected(): Boolean
@JvmStatic
private external fun ReleaseNetplayClient()
// NetPlayUI callbacks
@JvmStatic
fun onBootGame(gameFilePath: String, bootSessionDataPointer: Long) {
this.bootSessionDataPointer = bootSessionDataPointer
_launchGame.trySend(gameFilePath)
}
@JvmStatic
fun onConnectionError(message: String) {
_connectionErrors.trySend(message)
}
// Settings
@JvmStatic
external fun getNickname(): String
@ -116,53 +167,6 @@ object Netplay {
indexName: String,
indexPassword: String,
)
suspend fun join(): Boolean = withContext(Dispatchers.IO) {
netPlayClientPointer = Join()
val isConnected = netPlayClientPointer != 0L && isClientConnected()
if (!isActive) {
releaseNetplayClient()
return@withContext false
}
if (isConnected) {
return@withContext true
}
releaseNetplayClient()
false
}
suspend fun quit() = withContext(Dispatchers.IO) {
releaseNetplayClient()
}
private fun releaseNetplayClient() {
if (netPlayClientPointer != 0L) {
ReleaseNetplayClient()
netPlayClientPointer = 0
}
_launchGame.flush()
_connectionErrors.flush()
}
@JvmStatic
private external fun Join(): Long
@JvmStatic
private external fun ReleaseNetplayClient()
@JvmStatic
fun onBootGame(gameFilePath: String, bootSessionDataPointer: Long) {
this.bootSessionDataPointer = bootSessionDataPointer
_launchGame.trySend(gameFilePath)
}
@JvmStatic
fun onConnectionError(message: String) {
_connectionErrors.trySend(message)
}
}
private fun Channel<String>.flush() {