diff --git a/src/hooks/player/index.ts b/src/hooks/player/index.ts index 5e5257de..7d7deb8f 100644 --- a/src/hooks/player/index.ts +++ b/src/hooks/player/index.ts @@ -7,7 +7,8 @@ import { useNowPlaying, useOnPlaybackStateChange, } from 'react-native-nitro-player' -import { usePlaybackPosition, useTotalDuration } from '../../stores/player/playback' +import { usePlaybackPosition } from '../../stores/player/playback' +import { useCurrentTrack } from '../../stores/player/queue' interface UseProgressResult { position: number @@ -16,7 +17,7 @@ interface UseProgressResult { export const useProgress = (): UseProgressResult => { const position = usePlaybackPosition() - const totalDuration = useTotalDuration() + const totalDuration = useCurrentTrack()?.duration || 0 const playerEngineData = usePlayerEngineStore((state) => state.playerEngineData) diff --git a/src/providers/Player/utils/event-handlers.ts b/src/providers/Player/utils/event-handlers.ts index 8a858f84..6fc4b641 100644 --- a/src/providers/Player/utils/event-handlers.ts +++ b/src/providers/Player/utils/event-handlers.ts @@ -105,7 +105,6 @@ export async function onChangeTrack() { export async function onPlaybackProgress(position: number, totalDuration: number) { usePlayerPlaybackStore.setState({ position, - totalDuration, }) const { currentTrack } = usePlayerQueueStore.getState() diff --git a/src/stores/player/playback.ts b/src/stores/player/playback.ts index fe276626..ad20cd07 100644 --- a/src/stores/player/playback.ts +++ b/src/stores/player/playback.ts @@ -5,9 +5,6 @@ import { devtools, persist, createJSONStorage } from 'zustand/middleware' type PlayerPlaybackStore = { position: number setPosition: (position: number) => void - - totalDuration: number - setTotalDuration: (duration: number) => void } export const usePlayerPlaybackStore = create()( @@ -16,9 +13,6 @@ export const usePlayerPlaybackStore = create()( (set) => ({ position: 0, setPosition: (position: number) => set({ position }), - - totalDuration: 0, - setTotalDuration: (duration: number) => set({ totalDuration: duration }), }), { name: 'player-playback-storage', @@ -33,9 +27,3 @@ export const usePlaybackPosition = () => usePlayerPlaybackStore((state) => state export const setPlaybackPosition = (position: number) => { usePlayerPlaybackStore.getState().setPosition(position) } - -export const useTotalDuration = () => usePlayerPlaybackStore((state) => state.totalDuration) - -export const setTotalDuration = (duration: number) => { - usePlayerPlaybackStore.getState().setTotalDuration(duration) -}