mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-18 20:36:04 +00:00
fix(session): keep a retried session's first-frame and hud listeners
This commit is contained in:
1 parent
1ea8eb6cb3
commit
eeeba13b6c
3 files changed
+21
-9
No files matched your search
@@ -264,13 +264,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
handleHomeGuideIntent(intent)
|
||||
|
||||
updateOnScreenControls()
|
||||
WaylandCompositor.setFirstFrameListener {
|
||||
SessionEvents.firstFrame()
|
||||
runOnUiThread {
|
||||
loading.visible = false
|
||||
hud.start()
|
||||
}
|
||||
}
|
||||
WaylandCompositor.setFirstFrameListener(firstFrameListener)
|
||||
SessionEvents.markReadyIfPossible()
|
||||
SessionState.endListener = endListener
|
||||
// A single Back opens the session menu; two quick presses/swipes send the Steam QAM chord.
|
||||
@@ -1537,6 +1531,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
|
||||
/** Ours, so a finishing activity never unhooks the one that replaced it. */
|
||||
private val endListener: (Int) -> Unit = { status -> onSessionEnded(status) }
|
||||
private val firstFrameListener = Runnable {
|
||||
SessionEvents.firstFrame()
|
||||
runOnUiThread {
|
||||
loading.visible = false
|
||||
hud.start()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDestroy() {
|
||||
// Deliberately does NOT end the session: this activity can be destroyed while the user is
|
||||
@@ -1549,7 +1550,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback {
|
||||
if (::hud.isInitialized) hud.stop()
|
||||
padBridge?.stop()
|
||||
if (SessionState.endListener === endListener) SessionState.endListener = null
|
||||
WaylandCompositor.setFirstFrameListener(null)
|
||||
WaylandCompositor.clearFirstFrameListener(firstFrameListener)
|
||||
super.onDestroy()
|
||||
}
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@ class PerfHud(context: Context) {
|
||||
|
||||
fun stop() {
|
||||
running = false
|
||||
WaylandCompositor.setGameListener(null)
|
||||
WaylandCompositor.clearGameListener(listener)
|
||||
text = ""
|
||||
}
|
||||
|
||||
|
||||
@@ -26,6 +26,12 @@ public final class WaylandCompositor {
|
||||
* listener must marshal to the UI thread itself. */
|
||||
public static void setFirstFrameListener(Runnable r) { firstFrameListener = r; }
|
||||
|
||||
/** Clears the first-frame listener only if it is still {@code r}, so an activity going away
|
||||
* never drops the one its replacement registered. */
|
||||
public static synchronized void clearFirstFrameListener(Runnable r) {
|
||||
if (firstFrameListener == r) firstFrameListener = null;
|
||||
}
|
||||
|
||||
/** Invoked from native (banner_on_first_frame) on the first present. */
|
||||
@SuppressWarnings("unused")
|
||||
static void onFirstFramePresented() {
|
||||
@@ -52,6 +58,11 @@ public final class WaylandCompositor {
|
||||
|
||||
public static void setGameListener(GameListener l) { gameListener = l; }
|
||||
|
||||
/** Clears the game listener only if it is still {@code l}. */
|
||||
public static synchronized void clearGameListener(GameListener l) {
|
||||
if (gameListener == l) gameListener = null;
|
||||
}
|
||||
|
||||
/** Invoked from native (banner_on_game_surface). */
|
||||
@SuppressWarnings("unused")
|
||||
static void onGameSurface(String window, String gpuName) {
|
||||
|
||||
Reference in new issue
Block a user