Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions src/features/player/controller/usePlayerLifecycle.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useEffectEvent, type Dispatch, type SetStateAction } from "react";
import { Effect, FiberSet, Queue, Schema, Semaphore, Stream } from "effect";
import { Effect, Queue, Schema, Semaphore, Stream } from "effect";
import { getStartupMediaSource } from "@features/mediaOpen/startup";
import { listen } from "@tauri-apps/api/event";
import type { Window } from "@tauri-apps/api/window";
Expand Down Expand Up @@ -92,32 +92,12 @@ export function usePlayerLifecycle({
const lifecycle = Effect.scoped(
Effect.gen(function* () {
yield* Effect.addFinalizer(() => stopPlayer);
const runScoped = yield* FiberSet.makeRuntime<never, void, never>();
const mediaSources = yield* Queue.sliding<MediaSourceRequest>(1);
const windowResizes = yield* Queue.sliding<void>(1);
const offerMediaSource = (request: MediaSourceRequest): void => {
Effect.runSync(Queue.offer(mediaSources, request));
};

let autoCloseStarted = false;
yield* Effect.acquireRelease(
Effect.sync(() =>
player.subscribe((next) => {
if (!mounted || autoCloseStarted || !next.filename || !next.eofReached) {
return;
}

autoCloseStarted = true;
runScoped(
lifecyclePromise("close window", "Failed to close window", () =>
appWindow.close(),
).pipe(Effect.catch((error) => Effect.logError(error.operation, error))),
);
}),
),
(unsubscribe) => Effect.sync(unsubscribe),
);

yield* Effect.acquireRelease(
optionalListener(
lifecyclePromise("register drag listener", "Failed to listen for dropped media", () =>
Expand Down
2 changes: 0 additions & 2 deletions src/features/player/model/playerState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export type PlayerState = {
paused: boolean;
pausedForCache: boolean;
coreIdle: boolean;
eofReached: boolean;
timePos: number;
duration: number;
volume: number;
Expand All @@ -35,7 +34,6 @@ export const EMPTY_PLAYER_STATE: PlayerState = {
paused: true,
pausedForCache: false,
coreIdle: false,
eofReached: false,
timePos: 0,
duration: 0,
volume: DEFAULT_PLAYER_VOLUME,
Expand Down
1 change: 0 additions & 1 deletion src/integrations/mpv/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export const OBSERVED_PROPERTIES = [
["pause", "flag"],
["paused-for-cache", "flag"],
["core-idle", "flag"],
["eof-reached", "flag", "none"],
["time-pos", "double", "none"],
["duration", "double", "none"],
["volume", "double"],
Expand Down
2 changes: 0 additions & 2 deletions src/integrations/mpv/stateUpdates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ const PROPERTY_UPDATERS = {
updateField(state, "pausedForCache", isMpvBoolean(value) ? value : false),
"core-idle": (state, value) =>
updateField(state, "coreIdle", isMpvBoolean(value) ? value : false),
"eof-reached": (state, value) =>
updateField(state, "eofReached", isMpvBoolean(value) ? value : false),
"time-pos": (state, value) => updateField(state, "timePos", getNumberOrZero(value)),
duration: (state, value) => updateField(state, "duration", getNumberOrZero(value)),
volume: (state, value) => updateField(state, "volume", isMpvNumber(value) ? value : state.volume),
Expand Down
Loading