Merge branch 'develop' into autoskip

Relocates player-specific translation keys from the "player" namespace to the "common" namespace to improve reusability across different components.

All player-related strings (error messages, playback controls, download prompts) are now accessible as common translations, enabling their use throughout the application without namespace-specific imports.

app/(auth)/(tabs)/(home)/settings/segment-skip/page.tsx

@@ -0,0 +1,233 @@
+import { Ionicons } from "@expo/vector-icons";
+import { useNavigation } from "expo-router";
+import { TFunction } from "i18next";
+import { useEffect, useMemo } from "react";
+import { useTranslation } from "react-i18next";
+import { View } from "react-native";
+import { Text } from "@/components/common/Text";
+import { ListGroup } from "@/components/list/ListGroup";
+import { ListItem } from "@/components/list/ListItem";
+import { PlatformDropdown } from "@/components/PlatformDropdown";
+import DisabledSetting from "@/components/settings/DisabledSetting";
+import { useSettings } from "@/utils/atoms/settings";
+
+/**
+ * Factory function to create skip options for a specific segment type
+ * Reduces code duplication across all 5 segment types
+ */
+const useSkipOptions = (
+  settingKey:
+    | "skipIntro"
+    | "skipOutro"
+    | "skipRecap"
+    | "skipCommercial"
+    | "skipPreview",
+  settings: ReturnType<typeof useSettings>["settings"] | null,
+  updateSettings: ReturnType<typeof useSettings>["updateSettings"],
+  t: TFunction<"translation", undefined>,
+) => {
+  return useMemo(
+    () => [
+      {
+        options: SEGMENT_SKIP_OPTIONS(t).map((option) => ({
+          type: "radio" as const,
+          label: option.label,
+          value: option.value,
+          selected: option.value === settings?.[settingKey],
+          onPress: () => updateSettings({ [settingKey]: option.value }),
+        })),
+      },
+    ],
+    [settings?.[settingKey], updateSettings, t, settingKey],
+  );
+};
+
+export default function SegmentSkipPage() {
+  const { settings, updateSettings, pluginSettings } = useSettings();
+  const { t } = useTranslation();
+  const navigation = useNavigation();
+
+  useEffect(() => {
+    navigation.setOptions({
+      title: t("home.settings.other.segment_skip_settings"),
+    });
+  }, [navigation, t]);
+
+  const skipIntroOptions = useSkipOptions(
+    "skipIntro",
+    settings,
+    updateSettings,
+    t,
+  );
+  const skipOutroOptions = useSkipOptions(
+    "skipOutro",
+    settings,
+    updateSettings,
+    t,
+  );
+  const skipRecapOptions = useSkipOptions(
+    "skipRecap",
+    settings,
+    updateSettings,
+    t,
+  );
+  const skipCommercialOptions = useSkipOptions(
+    "skipCommercial",
+    settings,
+    updateSettings,
+    t,
+  );
+  const skipPreviewOptions = useSkipOptions(
+    "skipPreview",
+    settings,
+    updateSettings,
+    t,
+  );
+
+  if (!settings) return null;
+
+  return (
+    <DisabledSetting disabled={false} className='px-4'>
+      <ListGroup>
+        <ListItem
+          title={t("home.settings.other.skip_intro")}
+          subtitle={t("home.settings.other.skip_intro_description")}
+          disabled={pluginSettings?.skipIntro?.locked}
+        >
+          <PlatformDropdown
+            groups={skipIntroOptions}
+            trigger={
+              <View className='flex flex-row items-center justify-between py-1.5 pl-3'>
+                <Text className='mr-1 text-[#8E8D91]'>
+                  {t(`home.settings.other.segment_skip_${settings.skipIntro}`)}
+                </Text>
+                <Ionicons
+                  name='chevron-expand-sharp'
+                  size={18}
+                  color='#5A5960'
+                />
+              </View>
+            }
+            title={t("home.settings.other.skip_intro")}
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.other.skip_outro")}
+          subtitle={t("home.settings.other.skip_outro_description")}
+          disabled={pluginSettings?.skipOutro?.locked}
+        >
+          <PlatformDropdown
+            groups={skipOutroOptions}
+            trigger={
+              <View className='flex flex-row items-center justify-between py-1.5 pl-3'>
+                <Text className='mr-1 text-[#8E8D91]'>
+                  {t(`home.settings.other.segment_skip_${settings.skipOutro}`)}
+                </Text>
+                <Ionicons
+                  name='chevron-expand-sharp'
+                  size={18}
+                  color='#5A5960'
+                />
+              </View>
+            }
+            title={t("home.settings.other.skip_outro")}
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.other.skip_recap")}
+          subtitle={t("home.settings.other.skip_recap_description")}
+          disabled={pluginSettings?.skipRecap?.locked}
+        >
+          <PlatformDropdown
+            groups={skipRecapOptions}
+            trigger={
+              <View className='flex flex-row items-center justify-between py-1.5 pl-3'>
+                <Text className='mr-1 text-[#8E8D91]'>
+                  {t(`home.settings.other.segment_skip_${settings.skipRecap}`)}
+                </Text>
+                <Ionicons
+                  name='chevron-expand-sharp'
+                  size={18}
+                  color='#5A5960'
+                />
+              </View>
+            }
+            title={t("home.settings.other.skip_recap")}
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.other.skip_commercial")}
+          subtitle={t("home.settings.other.skip_commercial_description")}
+          disabled={pluginSettings?.skipCommercial?.locked}
+        >
+          <PlatformDropdown
+            groups={skipCommercialOptions}
+            trigger={
+              <View className='flex flex-row items-center justify-between py-1.5 pl-3'>
+                <Text className='mr-1 text-[#8E8D91]'>
+                  {t(
+                    `home.settings.other.segment_skip_${settings.skipCommercial}`,
+                  )}
+                </Text>
+                <Ionicons
+                  name='chevron-expand-sharp'
+                  size={18}
+                  color='#5A5960'
+                />
+              </View>
+            }
+            title={t("home.settings.other.skip_commercial")}
+          />
+        </ListItem>
+
+        <ListItem
+          title={t("home.settings.other.skip_preview")}
+          subtitle={t("home.settings.other.skip_preview_description")}
+          disabled={pluginSettings?.skipPreview?.locked}
+        >
+          <PlatformDropdown
+            groups={skipPreviewOptions}
+            trigger={
+              <View className='flex flex-row items-center justify-between py-1.5 pl-3'>
+                <Text className='mr-1 text-[#8E8D91]'>
+                  {t(
+                    `home.settings.other.segment_skip_${settings.skipPreview}`,
+                  )}
+                </Text>
+                <Ionicons
+                  name='chevron-expand-sharp'
+                  size={18}
+                  color='#5A5960'
+                />
+              </View>
+            }
+            title={t("home.settings.other.skip_preview")}
+          />
+        </ListItem>
+      </ListGroup>
+    </DisabledSetting>
+  );
+}
+
+const SEGMENT_SKIP_OPTIONS = (
+  t: TFunction<"translation", undefined>,
+): Array<{
+  label: string;
+  value: "none" | "ask" | "auto";
+}> => [
+  {
+    label: t("home.settings.other.segment_skip_auto"),
+    value: "auto",
+  },
+  {
+    label: t("home.settings.other.segment_skip_ask"),
+    value: "ask",
+  },
+  {
+    label: t("home.settings.other.segment_skip_none"),
+    value: "none",
+  },
+];

app/(auth)/player/direct-player.tsx

@@ -48,7 +48,6 @@ import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { OfflineModeProvider } from "@/providers/OfflineModeProvider";
 
 import { useSettings } from "@/utils/atoms/settings";
-import { getPrimaryImageUrl } from "@/utils/jellyfin/image/getPrimaryImageUrl";
 import { getStreamUrl } from "@/utils/jellyfin/media/getStreamUrl";
 import {
   getMpvAudioId,
@@ -134,7 +133,7 @@ export default function page() {
   const audioIndexFromUrl = audioIndexStr
     ? Number.parseInt(audioIndexStr, 10)
     : undefined;
-  const subtitleIndexFromUrl = subtitleIndexStr
+  const subtitleIndex = subtitleIndexStr
     ? Number.parseInt(subtitleIndexStr, 10)
     : -1;
   const bitrateValue = bitrateValueStr
@@ -161,24 +160,6 @@ export default function page() {
     return undefined;
   }, [audioIndexFromUrl, offline, downloadedItem?.userData?.audioStreamIndex]);
 
-  // Resolve subtitle index: use URL param if provided, otherwise use stored index for offline playback
-  const subtitleIndex = useMemo(() => {
-    if (subtitleIndexFromUrl !== undefined) {
-      return subtitleIndexFromUrl;
-    }
-    if (
-      offline &&
-      downloadedItem?.userData?.subtitleStreamIndex !== undefined
-    ) {
-      return downloadedItem.userData.subtitleStreamIndex;
-    }
-    return -1;
-  }, [
-    subtitleIndexFromUrl,
-    offline,
-    downloadedItem?.userData?.subtitleStreamIndex,
-  ]);
-
   // Get the playback speed for this item based on settings
   const { playbackSpeed: initialPlaybackSpeed } = usePlaybackSpeed(
     item,
@@ -424,8 +405,8 @@ export default function page() {
 
     return {
       ItemId: item.Id,
-      AudioStreamIndex: audioIndex,
+      AudioStreamIndex: audioIndex ? audioIndex : undefined,
-      SubtitleStreamIndex: subtitleIndex,
+      SubtitleStreamIndex: subtitleIndex ? subtitleIndex : undefined,
       MediaSourceId: mediaSourceId,
       PositionTicks: msToTicks(progress.get()),
       IsPaused: !isPlaying,
@@ -523,31 +504,6 @@ export default function page() {
     return ticksToSeconds(getInitialPlaybackTicks());
   }, [getInitialPlaybackTicks]);
 
-  /** Prepare metadata for iOS native media controls (Control Center, Lock Screen) */
-  const nowPlayingMetadata = useMemo(() => {
-    if (!item || !api) return undefined;
-
-    const artworkUri = getPrimaryImageUrl({
-      api,
-      item,
-      quality: 90,
-      width: 500,
-    });
-
-    return {
-      title: item.Name || "",
-      artist:
-        item.Type === "Episode"
-          ? item.SeriesName || ""
-          : item.AlbumArtist || "",
-      albumTitle:
-        item.Type === "Episode" && item.SeasonName
-          ? item.SeasonName
-          : undefined,
-      artworkUri: artworkUri || undefined,
-    };
-  }, [item, api]);
-
   /** Build video source config for MPV */
   const videoSource = useMemo<MpvVideoSource | undefined>(() => {
     if (!stream?.url) return undefined;
@@ -976,7 +932,6 @@ export default function page() {
                 ref={videoRef}
                 source={videoSource}
                 style={{ width: "100%", height: "100%" }}
-                nowPlayingMetadata={nowPlayingMetadata}
                 onProgress={onProgress}
                 onPlaybackStateChange={onPlaybackStateChanged}
                 onLoad={() => setIsVideoLoaded(true)}

components/ItemContent.tsx

@@ -25,7 +25,6 @@ import useDefaultPlaySettings from "@/hooks/useDefaultPlaySettings";
 import { useImageColorsReturn } from "@/hooks/useImageColorsReturn";
 import { useOrientation } from "@/hooks/useOrientation";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
-import { useDownload } from "@/providers/DownloadProvider";
 import { apiAtom, userAtom } from "@/providers/JellyfinProvider";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
@@ -54,9 +53,6 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
   ({ item, itemWithSources }) => {
     const [api] = useAtom(apiAtom);
     const isOffline = useOfflineMode();
-    const { getDownloadedItemById } = useDownload();
-    const downloadedItem =
-      isOffline && item.Id ? getDownloadedItemById(item.Id) : null;
     const { settings } = useSettings();
     const { orientation } = useOrientation();
     const navigation = useNavigation();
@@ -95,29 +91,17 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
 
     // Needs to automatically change the selected to the default values for default indexes.
     useEffect(() => {
-      // When offline, use the indices stored in userData (the last-used tracks for this file)
-      // rather than the server's defaults, so MediaSourceButton reflects what will actually play.
-      const offlineUserData = downloadedItem?.userData;
-
       setSelectedOptions(() => ({
         bitrate: defaultBitrate,
         mediaSource: defaultMediaSource ?? undefined,
-        subtitleIndex:
+        subtitleIndex: defaultSubtitleIndex ?? -1,
-          offlineUserData && !offlineUserData.isTranscoded
+        audioIndex: defaultAudioIndex,
-            ? offlineUserData.subtitleStreamIndex
-            : (defaultSubtitleIndex ?? -1),
-        audioIndex:
-          offlineUserData && !offlineUserData.isTranscoded
-            ? offlineUserData.audioStreamIndex
-            : defaultAudioIndex,
       }));
     }, [
       defaultAudioIndex,
       defaultBitrate,
       defaultSubtitleIndex,
       defaultMediaSource,
-      downloadedItem?.userData?.audioStreamIndex,
-      downloadedItem?.userData?.subtitleStreamIndex,
     ]);
 
     useEffect(() => {
@@ -248,12 +232,14 @@ export const ItemContent: React.FC<ItemContentProps> = React.memo(
                   colors={itemColors}
                 />
                 <View className='w-1' />
-                <MediaSourceButton
+                {!isOffline && (
-                  selectedOptions={selectedOptions}
+                  <MediaSourceButton
-                  setSelectedOptions={setSelectedOptions}
+                    selectedOptions={selectedOptions}
-                  item={itemWithSources}
+                    setSelectedOptions={setSelectedOptions}
-                  colors={itemColors}
+                    item={itemWithSources}
-                />
+                    colors={itemColors}
+                  />
+                )}
               </View>
             </View>
             {item.Type === "Episode" && (

components/MediaSourceButton.tsx

@@ -7,8 +7,6 @@ import { useCallback, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { ActivityIndicator, TouchableOpacity, View } from "react-native";
 import type { ThemeColors } from "@/hooks/useImageColorsReturn";
-import { useDownload } from "@/providers/DownloadProvider";
-import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { BITRATES } from "./BitRateSheet";
 import type { SelectedOptions } from "./ItemContent";
 import { type OptionGroup, PlatformDropdown } from "./PlatformDropdown";
@@ -30,14 +28,6 @@ export const MediaSourceButton: React.FC<Props> = ({
 }: Props) => {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
-  const isOffline = useOfflineMode();
-  const { getDownloadedItemById } = useDownload();
-
-  // For transcoded downloads there's only one burned-in track — nothing to pick
-  const isTranscodedDownload = useMemo(() => {
-    if (!isOffline || !item?.Id) return false;
-    return getDownloadedItemById(item.Id)?.userData?.isTranscoded === true;
-  }, [isOffline, item?.Id, getDownloadedItemById]);
 
   const effectiveColors = colors || {
     primary: "#7c3aed",
@@ -82,36 +72,34 @@ export const MediaSourceButton: React.FC<Props> = ({
   const optionGroups: OptionGroup[] = useMemo(() => {
     const groups: OptionGroup[] = [];
 
-    if (!isOffline) {
+    // Bitrate group
-      // Bitrate group
+    groups.push({
+      title: t("item_card.quality"),
+      options: BITRATES.map((bitrate) => ({
+        type: "radio" as const,
+        label: bitrate.key,
+        value: bitrate,
+        selected: bitrate.value === selectedOptions.bitrate?.value,
+        onPress: () =>
+          setSelectedOptions((prev) => prev && { ...prev, bitrate }),
+      })),
+    });
+
+    // Media Source group (only if multiple sources)
+    if (item?.MediaSources && item.MediaSources.length > 1) {
       groups.push({
-        title: t("item_card.quality"),
+        title: t("item_card.video"),
-        options: BITRATES.map((bitrate) => ({
+        options: item.MediaSources.map((source) => ({
           type: "radio" as const,
-          label: bitrate.key,
+          label: getMediaSourceDisplayName(source),
-          value: bitrate,
+          value: source,
-          selected: bitrate.value === selectedOptions.bitrate?.value,
+          selected: source.Id === selectedOptions.mediaSource?.Id,
           onPress: () =>
-            setSelectedOptions((prev) => prev && { ...prev, bitrate }),
+            setSelectedOptions(
+              (prev) => prev && { ...prev, mediaSource: source },
+            ),
         })),
       });
-
-      // Media Source group (only if multiple sources)
-      if (item?.MediaSources && item.MediaSources.length > 1) {
-        groups.push({
-          title: t("item_card.video"),
-          options: item.MediaSources.map((source) => ({
-            type: "radio" as const,
-            label: getMediaSourceDisplayName(source),
-            value: source,
-            selected: source.Id === selectedOptions.mediaSource?.Id,
-            onPress: () =>
-              setSelectedOptions(
-                (prev) => prev && { ...prev, mediaSource: source },
-              ),
-          })),
-        });
-      }
     }
 
     // Audio track group
@@ -162,7 +150,6 @@ export const MediaSourceButton: React.FC<Props> = ({
     return groups;
   }, [
     item,
-    isOffline,
     selectedOptions,
     audioStreams,
     subtitleStreams,
@@ -191,8 +178,6 @@ export const MediaSourceButton: React.FC<Props> = ({
     </TouchableOpacity>
   );
 
-  if (isTranscodedDownload) return null;
-
   return (
     <PlatformDropdown
       groups={optionGroups}

components/PlayButton.tsx

@@ -96,23 +96,14 @@ export const PlayButton: React.FC<Props> = ({
 
     const queryParams = new URLSearchParams({
       itemId: item.Id!,
+      audioIndex: selectedOptions.audioIndex?.toString() ?? "",
+      subtitleIndex: selectedOptions.subtitleIndex?.toString() ?? "",
       mediaSourceId: selectedOptions.mediaSource?.Id ?? "",
       bitrateValue: selectedOptions.bitrate?.value?.toString() ?? "",
       playbackPosition: item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
       offline: isOffline ? "true" : "false",
     });
 
-    if (selectedOptions.audioIndex !== undefined) {
-      queryParams.set("audioIndex", selectedOptions.audioIndex.toString());
-    }
-
-    if (selectedOptions.subtitleIndex !== undefined) {
-      queryParams.set(
-        "subtitleIndex",
-        selectedOptions.subtitleIndex.toString(),
-      );
-    }
-
     const queryString = queryParams.toString();
 
     if (!client) {
@@ -301,29 +292,6 @@ export const PlayButton: React.FC<Props> = ({
     t,
   ]);
 
-  const buildOfflineQueryParams = useCallback(
-    (downloadedItem: NonNullable<ReturnType<typeof getDownloadedItemById>>) => {
-      const isTranscoded = downloadedItem.userData?.isTranscoded === true;
-      const audioIdx = isTranscoded
-        ? downloadedItem.userData?.audioStreamIndex
-        : selectedOptions.audioIndex;
-      const subtitleIdx = isTranscoded
-        ? downloadedItem.userData?.subtitleStreamIndex
-        : selectedOptions.subtitleIndex;
-      const params = new URLSearchParams({
-        itemId: item.Id!,
-        offline: "true",
-        playbackPosition:
-          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
-      });
-      if (audioIdx !== undefined) params.set("audioIndex", audioIdx.toString());
-      if (subtitleIdx !== undefined)
-        params.set("subtitleIndex", subtitleIdx.toString());
-      return params;
-    },
-    [item, selectedOptions],
-  );
-
   const onPress = useCallback(async () => {
     if (!item) return;
 
@@ -334,7 +302,13 @@ export const PlayButton: React.FC<Props> = ({
 
     // If already in offline mode, play downloaded file directly
     if (isOffline && downloadedItem) {
-      goToPlayer(buildOfflineQueryParams(downloadedItem).toString());
+      const queryParams = new URLSearchParams({
+        itemId: item.Id!,
+        offline: "true",
+        playbackPosition:
+          item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+      });
+      goToPlayer(queryParams.toString());
       return;
     }
 
@@ -357,9 +331,13 @@ export const PlayButton: React.FC<Props> = ({
                 <Button
                   onPress={() => {
                     hideModal();
-                    goToPlayer(
+                    const queryParams = new URLSearchParams({
-                      buildOfflineQueryParams(downloadedItem).toString(),
+                      itemId: item.Id!,
-                    );
+                      offline: "true",
+                      playbackPosition:
+                        item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+                    });
+                    goToPlayer(queryParams.toString());
                   }}
                   color='purple'
                 >
@@ -396,7 +374,13 @@ export const PlayButton: React.FC<Props> = ({
             {
               text: t("player.downloaded_file_yes"),
               onPress: () => {
-                goToPlayer(buildOfflineQueryParams(downloadedItem).toString());
+                const queryParams = new URLSearchParams({
+                  itemId: item.Id!,
+                  offline: "true",
+                  playbackPosition:
+                    item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
+                });
+                goToPlayer(queryParams.toString());
               },
               isPreferred: true,
             },

components/settings/PlaybackControlsSettings.tsx

@@ -8,6 +8,7 @@ import { BITRATES } from "@/components/BitrateSelector";
 import { PlatformDropdown } from "@/components/PlatformDropdown";
 import { PLAYBACK_SPEEDS } from "@/components/PlaybackSpeedSelector";
 import DisabledSetting from "@/components/settings/DisabledSetting";
+import useRouter from "@/hooks/useAppRouter";
 import * as ScreenOrientation from "@/packages/expo-screen-orientation";
 import { ScreenOrientationEnum, useSettings } from "@/utils/atoms/settings";
 import { Text } from "../common/Text";
@@ -15,6 +16,7 @@ import { ListGroup } from "../list/ListGroup";
 import { ListItem } from "../list/ListItem";
 
 export const PlaybackControlsSettings: React.FC = () => {
+  const router = useRouter();
   const { settings, updateSettings, pluginSettings } = useSettings();
   const { t } = useTranslation();
 
@@ -248,6 +250,15 @@ export const PlaybackControlsSettings: React.FC = () => {
             title={t("home.settings.other.max_auto_play_episode_count")}
           />
         </ListItem>
+
+        {/* Media Segment Skip Settings */}
+        <ListItem
+          title={t("home.settings.other.segment_skip_settings")}
+          subtitle={t("home.settings.other.segment_skip_settings_description")}
+          onPress={() => router.push("/settings/segment-skip/page")}
+        >
+          <Ionicons name='chevron-forward' size={20} color='#8E8D91' />
+        </ListItem>
       </ListGroup>
     </DisabledSetting>
   );

components/video-player/controls/BottomControls.tsx

@@ -19,7 +19,9 @@ interface BottomControlsProps {
   currentTime: number;
   remainingTime: number;
   showSkipButton: boolean;
+  skipButtonText: string;
   showSkipCreditButton: boolean;
+  skipCreditButtonText: string;
   hasContentAfterCredits: boolean;
   skipIntro: () => void;
   skipCredit: () => void;
@@ -67,7 +69,9 @@ export const BottomControls: FC<BottomControlsProps> = ({
   currentTime,
   remainingTime,
   showSkipButton,
+  skipButtonText,
   showSkipCreditButton,
+  skipCreditButtonText,
   hasContentAfterCredits,
   skipIntro,
   skipCredit,
@@ -136,7 +140,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
           <SkipButton
             showButton={showSkipButton}
             onPress={skipIntro}
-            buttonText='Skip Intro'
+            buttonText={skipButtonText}
           />
           {/* Smart Skip Credits behavior:
               - Show "Skip Credits" if there's content after credits OR no next episode
@@ -146,7 +150,7 @@ export const BottomControls: FC<BottomControlsProps> = ({
               showSkipCreditButton && (hasContentAfterCredits || !nextItem)
             }
             onPress={skipCredit}
-            buttonText='Skip Credits'
+            buttonText={skipCreditButtonText}
           />
           {settings.autoPlayNextEpisode !== false &&
             (settings.maxAutoPlayEpisodeCount.value === -1 ||

components/video-player/controls/Controls.tsx

@@ -4,7 +4,15 @@ import type {
   MediaSourceInfo,
 } from "@jellyfin/sdk/lib/generated-client";
 import { useLocalSearchParams } from "expo-router";
-import { type FC, useCallback, useEffect, useState } from "react";
+import {
+  type FC,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
+import { useTranslation } from "react-i18next";
 import { StyleSheet, useWindowDimensions, View } from "react-native";
 import Animated, {
   Easing,
@@ -16,17 +24,17 @@ import Animated, {
 } from "react-native-reanimated";
 import ContinueWatchingOverlay from "@/components/video-player/controls/ContinueWatchingOverlay";
 import useRouter from "@/hooks/useAppRouter";
-import { useCreditSkipper } from "@/hooks/useCreditSkipper";
 import { useHaptic } from "@/hooks/useHaptic";
-import { useIntroSkipper } from "@/hooks/useIntroSkipper";
 import { usePlaybackManager } from "@/hooks/usePlaybackManager";
+import { useSegmentSkipper } from "@/hooks/useSegmentSkipper";
 import { useTrickplay } from "@/hooks/useTrickplay";
 import type { TechnicalInfo } from "@/modules/mpv-player";
 import { DownloadedItem } from "@/providers/Downloads/types";
 import { useOfflineMode } from "@/providers/OfflineModeProvider";
 import { useSettings } from "@/utils/atoms/settings";
 import { getDefaultPlaySettings } from "@/utils/jellyfin/getDefaultPlaySettings";
-import { ticksToMs } from "@/utils/time";
+import { useSegments } from "@/utils/segments";
+import { msToSeconds, ticksToMs } from "@/utils/time";
 import { BottomControls } from "./BottomControls";
 import { CenterControls } from "./CenterControls";
 import { CONTROLS_CONSTANTS } from "./constants";
@@ -42,6 +50,9 @@ import { useControlsTimeout } from "./useControlsTimeout";
 import { PlaybackSpeedScope } from "./utils/playback-speed-settings";
 import { type AspectRatio } from "./VideoScalingModeSelector";
 
+// No-op function to avoid creating new references on every render
+const noop = () => {};
+
 interface Props {
   item: BaseItemDto;
   isPlaying: boolean;
@@ -110,6 +121,18 @@ export const Controls: FC<Props> = ({
   const [episodeView, setEpisodeView] = useState(false);
   const [showAudioSlider, setShowAudioSlider] = useState(false);
 
+  // Ref to track pending play timeout for cleanup and cancellation
+  const playTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  // Clean up timeout on unmount
+  useEffect(() => {
+    return () => {
+      if (playTimeoutRef.current) {
+        clearTimeout(playTimeoutRef.current);
+      }
+    };
+  }, []);
+
   const { height: screenHeight, width: screenWidth } = useWindowDimensions();
   const { previousItem, nextItem } = usePlaybackManager({
     item,
@@ -300,27 +323,122 @@ export const Controls: FC<Props> = ({
     subtitleIndex: string;
   }>();
 
-  const { showSkipButton, skipIntro } = useIntroSkipper(
+  // Fetch all segments for the current item
-    item.Id!,
+  const { data: segments } = useSegments(
-    currentTime,
+    item.Id ?? "",
-    seek,
-    play,
     offline,
-    api,
     downloadedFiles,
+    api,
   );
 
-  const { showSkipCreditButton, skipCredit, hasContentAfterCredits } =
+  // Convert milliseconds to seconds for segment comparison
-    useCreditSkipper(
+  const currentTimeSeconds = msToSeconds(currentTime);
-      item.Id!,
+  const maxSeconds = maxMs ? msToSeconds(maxMs) : undefined;
-      currentTime,
+
-      seek,
+  // Wrapper to convert segment skip from seconds to milliseconds
-      play,
+  // Includes 200ms delay to allow seek operation to complete before resuming playback
-      offline,
+  const seekMs = useCallback(
-      api,
+    (timeInSeconds: number) => {
-      downloadedFiles,
+      // Cancel any pending play call to avoid race conditions
-      maxMs,
+      if (playTimeoutRef.current) {
-    );
+        clearTimeout(playTimeoutRef.current);
+      }
+      seek(timeInSeconds * 1000);
+      // Brief delay ensures the seek operation completes before resuming playback
+      // Without this, playback may resume from the old position
+      playTimeoutRef.current = setTimeout(() => {
+        play();
+        playTimeoutRef.current = null;
+      }, 200);
+    },
+    [seek, play],
+  );
+
+  // Use unified segment skipper for all segment types
+  const introSkipper = useSegmentSkipper({
+    segments: segments?.introSegments || [],
+    segmentType: "Intro",
+    currentTime: currentTimeSeconds,
+    seek: seekMs,
+    isPaused: !isPlaying,
+  });
+
+  const outroSkipper = useSegmentSkipper({
+    segments: segments?.creditSegments || [],
+    segmentType: "Outro",
+    currentTime: currentTimeSeconds,
+    totalDuration: maxSeconds,
+    seek: seekMs,
+    isPaused: !isPlaying,
+  });
+
+  const recapSkipper = useSegmentSkipper({
+    segments: segments?.recapSegments || [],
+    segmentType: "Recap",
+    currentTime: currentTimeSeconds,
+    seek: seekMs,
+    isPaused: !isPlaying,
+  });
+
+  const commercialSkipper = useSegmentSkipper({
+    segments: segments?.commercialSegments || [],
+    segmentType: "Commercial",
+    currentTime: currentTimeSeconds,
+    seek: seekMs,
+    isPaused: !isPlaying,
+  });
+
+  const previewSkipper = useSegmentSkipper({
+    segments: segments?.previewSegments || [],
+    segmentType: "Preview",
+    currentTime: currentTimeSeconds,
+    seek: seekMs,
+    isPaused: !isPlaying,
+  });
+
+  // Determine which segment button to show (priority order)
+  // Commercial > Recap > Intro > Preview > Outro
+  const activeSegment = useMemo(() => {
+    if (commercialSkipper.currentSegment)
+      return { type: "Commercial", ...commercialSkipper };
+    if (recapSkipper.currentSegment) return { type: "Recap", ...recapSkipper };
+    if (introSkipper.currentSegment) return { type: "Intro", ...introSkipper };
+    if (previewSkipper.currentSegment)
+      return { type: "Preview", ...previewSkipper };
+    if (outroSkipper.currentSegment) return { type: "Outro", ...outroSkipper };
+    return null;
+  }, [
+    commercialSkipper.currentSegment,
+    recapSkipper.currentSegment,
+    introSkipper.currentSegment,
+    previewSkipper.currentSegment,
+    outroSkipper.currentSegment,
+    commercialSkipper,
+    recapSkipper,
+    introSkipper,
+    previewSkipper,
+    outroSkipper,
+  ]);
+
+  // Legacy compatibility: map to old variable names
+  const showSkipButton = !!(
+    activeSegment &&
+    ["Intro", "Recap", "Commercial", "Preview"].includes(activeSegment.type)
+  );
+  const skipIntro = activeSegment?.skipSegment || noop;
+  const showSkipCreditButton = activeSegment?.type === "Outro";
+  const skipCredit = outroSkipper.skipSegment;
+  const hasContentAfterCredits =
+    outroSkipper.currentSegment && maxSeconds
+      ? outroSkipper.currentSegment.endTime < maxSeconds
+      : false;
+
+  // Get button text based on segment type using i18n
+  const { t } = useTranslation();
+  const skipButtonText = activeSegment
+    ? t(`player.skip_${activeSegment.type.toLowerCase()}`)
+    : t("player.skip_intro");
+  const skipCreditButtonText = t("player.skip_outro");
 
   const goToItemCommon = useCallback(
     (item: BaseItemDto) => {
@@ -534,7 +652,9 @@ export const Controls: FC<Props> = ({
               currentTime={currentTime}
               remainingTime={remainingTime}
               showSkipButton={showSkipButton}
+              skipButtonText={skipButtonText}
               showSkipCreditButton={showSkipCreditButton}
+              skipCreditButtonText={skipCreditButtonText}
               hasContentAfterCredits={hasContentAfterCredits}
               skipIntro={skipIntro}
               skipCredit={skipCredit}

hooks/useDownloadedFileOpener.ts

@@ -1,7 +1,6 @@
 import type { BaseItemDto } from "@jellyfin/sdk/lib/generated-client";
 import { useCallback } from "react";
 import useRouter from "@/hooks/useAppRouter";
-import { getDownloadedItemById } from "@/providers/Downloads/database";
 import { usePlaySettings } from "@/providers/PlaySettingsProvider";
 import { writeToLog } from "@/utils/log";
 
@@ -16,27 +15,12 @@ export const useDownloadedFileOpener = () => {
         console.error("Attempted to open a file without an ID.");
         return;
       }
-      const downloadedItem = getDownloadedItemById(item.Id);
       const queryParams = new URLSearchParams({
         itemId: item.Id,
         offline: "true",
         playbackPosition:
           item.UserData?.PlaybackPositionTicks?.toString() ?? "0",
       });
-
-      if (downloadedItem?.userData?.audioStreamIndex !== undefined) {
-        queryParams.set(
-          "audioIndex",
-          downloadedItem.userData.audioStreamIndex.toString(),
-        );
-      }
-      if (downloadedItem?.userData?.subtitleStreamIndex !== undefined) {
-        queryParams.set(
-          "subtitleIndex",
-          downloadedItem.userData.subtitleStreamIndex.toString(),
-        );
-      }
-
       try {
         router.push(`/player/direct-player?${queryParams.toString()}`);
       } catch (error) {

hooks/usePlaybackManager.ts

@@ -186,20 +186,6 @@ export const usePlaybackManager = ({
                 : playedPercentage,
           },
         },
-        // Sync selected audio/subtitle tracks so next playback resumes with
-        // the same tracks the user had active — but only for non-transcoded
-        // downloads where the user can freely switch tracks.
-        userData: localItem.userData.isTranscoded
-          ? localItem.userData
-          : {
-              ...localItem.userData,
-              audioStreamIndex:
-                playbackProgressInfo.AudioStreamIndex ??
-                localItem.userData.audioStreamIndex,
-              subtitleStreamIndex:
-                playbackProgressInfo.SubtitleStreamIndex ??
-                localItem.userData.subtitleStreamIndex,
-            },
       });
       // Force invalidate queries so they refetch from updated local database
       queryClient.invalidateQueries({ queryKey: ["item", itemId] });

hooks/useSegmentSkipper.ts

@@ -0,0 +1,105 @@
+import { useCallback, useEffect, useRef } from "react";
+import { MediaTimeSegment } from "@/providers/Downloads/types";
+import { useSettings } from "@/utils/atoms/settings";
+import { useHaptic } from "./useHaptic";
+
+type SegmentType = "Intro" | "Outro" | "Recap" | "Commercial" | "Preview";
+
+interface UseSegmentSkipperProps {
+  segments: MediaTimeSegment[];
+  segmentType: SegmentType;
+  currentTime: number;
+  totalDuration?: number;
+  seek: (time: number) => void;
+  isPaused: boolean;
+}
+
+interface UseSegmentSkipperReturn {
+  currentSegment: MediaTimeSegment | null;
+  skipSegment: (notifyOrUseHaptics?: boolean) => void;
+}
+
+/**
+ * Generic hook to handle all media segment types (intro, outro, recap, commercial, preview)
+ * Supports three modes: 'none' (disabled), 'ask' (show button), 'auto' (auto-skip)
+ */
+export const useSegmentSkipper = ({
+  segments,
+  segmentType,
+  currentTime,
+  totalDuration,
+  seek,
+  isPaused,
+}: UseSegmentSkipperProps): UseSegmentSkipperReturn => {
+  const { settings } = useSettings();
+  const haptic = useHaptic();
+  const autoSkipTriggeredRef = useRef(false);
+
+  // Get skip mode based on segment type
+  const skipMode = (() => {
+    switch (segmentType) {
+      case "Intro":
+        return settings.skipIntro;
+      case "Outro":
+        return settings.skipOutro;
+      case "Recap":
+        return settings.skipRecap;
+      case "Commercial":
+        return settings.skipCommercial;
+      case "Preview":
+        return settings.skipPreview;
+      default:
+        return "none";
+    }
+  })();
+
+  // Find current segment
+  const currentSegment =
+    segments.find(
+      (segment) =>
+        currentTime >= segment.startTime && currentTime < segment.endTime,
+    ) || null;
+
+  // Skip function with optional haptic feedback
+  const skipSegment = useCallback(
+    (notifyOrUseHaptics = true) => {
+      if (!currentSegment) return;
+
+      // For Outro segments, prevent seeking past the end
+      if (segmentType === "Outro" && totalDuration) {
+        const seekTime = Math.min(currentSegment.endTime, totalDuration);
+        seek(seekTime);
+      } else {
+        seek(currentSegment.endTime);
+      }
+
+      // Only trigger haptic feedback if explicitly requested (manual skip)
+      if (notifyOrUseHaptics) {
+        haptic();
+      }
+    },
+    [currentSegment, segmentType, totalDuration, seek, haptic],
+  );
+  // Auto-skip logic when mode is 'auto'
+  useEffect(() => {
+    if (skipMode !== "auto" || isPaused) {
+      autoSkipTriggeredRef.current = false;
+      return;
+    }
+
+    if (currentSegment && !autoSkipTriggeredRef.current) {
+      autoSkipTriggeredRef.current = true;
+      skipSegment(false); // Don't trigger haptics for auto-skip
+    }
+
+    if (!currentSegment) {
+      autoSkipTriggeredRef.current = false;
+    }
+  }, [currentSegment, skipMode, isPaused, skipSegment]);
+
+  // Return null segment if skip mode is 'none'
+  return {
+    currentSegment: skipMode === "none" ? null : currentSegment,
+    skipSegment,
+  };
+};

modules/mpv-player/android/src/main/java/expo/modules/mpvplayer/MpvPlayerModule.kt

@@ -43,12 +43,6 @@ class MpvPlayerModule : Module() {
                 view.loadVideo(config)
             }
 
-            // Now Playing metadata for media controls (iOS-only, no-op on Android)
-            // Android handles media session differently via MediaSessionCompat
-            Prop("nowPlayingMetadata") { _: MpvPlayerView, _: Map<String, String>? ->
-                // No-op on Android - media session integration would require MediaSessionCompat
-            }
-
             // Async function to play video
             AsyncFunction("play") { view: MpvPlayerView ->
                 view.play()

modules/mpv-player/ios/MPVLayerRenderer.swift

@@ -10,7 +10,6 @@ protocol MPVLayerRendererDelegate: AnyObject {
     func renderer(_ renderer: MPVLayerRenderer, didChangeLoading isLoading: Bool)
     func renderer(_ renderer: MPVLayerRenderer, didBecomeReadyToSeek: Bool)
     func renderer(_ renderer: MPVLayerRenderer, didBecomeTracksReady: Bool)
-    func renderer(_ renderer: MPVLayerRenderer, didSelectAudioOutput audioOutput: String)
 }
 
 /// MPV player using vo_avfoundation for video output.
@@ -348,8 +347,7 @@ final class MPVLayerRenderer {
             ("pause", MPV_FORMAT_FLAG),
             ("track-list/count", MPV_FORMAT_INT64),
             ("paused-for-cache", MPV_FORMAT_FLAG),
-            ("demuxer-cache-duration", MPV_FORMAT_DOUBLE),
+            ("demuxer-cache-duration", MPV_FORMAT_DOUBLE)
-            ("current-ao", MPV_FORMAT_STRING)
         ]
         for (name, format) in properties {
             mpv_observe_property(handle, 0, name, format)
@@ -554,15 +552,6 @@ final class MPVLayerRenderer {
                     self.delegate?.renderer(self, didBecomeTracksReady: true)
                 }
             }
-        case "current-ao":
-            // Audio output is now active - notify delegate
-            if let aoName = getStringProperty(handle: handle, name: name) {
-                print("[MPV] 🔊 Audio output selected: \(aoName)")
-                DispatchQueue.main.async { [weak self] in
-                    guard let self else { return }
-                    self.delegate?.renderer(self, didSelectAudioOutput: aoName)
-                }
-            }
         default:
             break
         }

modules/mpv-player/ios/MPVNowPlayingManager.swift

@@ -1,188 +0,0 @@
-import Foundation
-import MediaPlayer
-import UIKit
-import AVFoundation
-
-/// Simple manager for Now Playing info and remote commands.
-/// Stores all state internally and updates Now Playing when ready.
-class MPVNowPlayingManager {
-    static let shared = MPVNowPlayingManager()
-    
-    // State
-    private var title: String?
-    private var artist: String?
-    private var albumTitle: String?
-    private var cachedArtwork: MPMediaItemArtwork?
-    private var duration: TimeInterval = 0
-    private var position: TimeInterval = 0
-    private var isPlaying: Bool = false
-    private var isCommandsSetup = false
-    
-    private var artworkTask: URLSessionDataTask?
-    
-    private init() {}
-    
-    // MARK: - Audio Session
-    
-    func activateAudioSession() {
-        do {
-            let session = AVAudioSession.sharedInstance()
-            try session.setCategory(.playback, mode: .moviePlayback)
-            try session.setActive(true)
-            print("[NowPlaying] Audio session activated")
-        } catch {
-            print("[NowPlaying] Audio session error: \(error)")
-        }
-    }
-    
-    func deactivateAudioSession() {
-        do {
-            try AVAudioSession.sharedInstance().setActive(false, options: .notifyOthersOnDeactivation)
-            print("[NowPlaying] Audio session deactivated")
-        } catch {
-            print("[NowPlaying] Deactivation error: \(error)")
-        }
-    }
-    
-    // MARK: - Remote Commands
-    
-    func setupRemoteCommands(
-        playHandler: @escaping () -> Void,
-        pauseHandler: @escaping () -> Void,
-        toggleHandler: @escaping () -> Void,
-        seekHandler: @escaping (TimeInterval) -> Void,
-        skipForward: @escaping (TimeInterval) -> Void,
-        skipBackward: @escaping (TimeInterval) -> Void
-    ) {
-        guard !isCommandsSetup else { return }
-        isCommandsSetup = true
-        
-        DispatchQueue.main.async {
-            UIApplication.shared.beginReceivingRemoteControlEvents()
-        }
-        
-        let cc = MPRemoteCommandCenter.shared()
-        
-        cc.playCommand.isEnabled = true
-        cc.playCommand.addTarget { _ in playHandler(); return .success }
-        
-        cc.pauseCommand.isEnabled = true
-        cc.pauseCommand.addTarget { _ in pauseHandler(); return .success }
-        
-        cc.togglePlayPauseCommand.isEnabled = true
-        cc.togglePlayPauseCommand.addTarget { _ in toggleHandler(); return .success }
-        
-        cc.skipForwardCommand.isEnabled = true
-        cc.skipForwardCommand.preferredIntervals = [15]
-        cc.skipForwardCommand.addTarget { e in
-            if let ev = e as? MPSkipIntervalCommandEvent { skipForward(ev.interval) }
-            return .success
-        }
-        
-        cc.skipBackwardCommand.isEnabled = true
-        cc.skipBackwardCommand.preferredIntervals = [15]
-        cc.skipBackwardCommand.addTarget { e in
-            if let ev = e as? MPSkipIntervalCommandEvent { skipBackward(ev.interval) }
-            return .success
-        }
-        
-        cc.changePlaybackPositionCommand.isEnabled = true
-        cc.changePlaybackPositionCommand.addTarget { e in
-            if let ev = e as? MPChangePlaybackPositionCommandEvent { seekHandler(ev.positionTime) }
-            return .success
-        }
-        
-        print("[NowPlaying] Remote commands ready")
-    }
-    
-    func cleanupRemoteCommands() {
-        guard isCommandsSetup else { return }
-        
-        let cc = MPRemoteCommandCenter.shared()
-        cc.playCommand.removeTarget(nil)
-        cc.pauseCommand.removeTarget(nil)
-        cc.togglePlayPauseCommand.removeTarget(nil)
-        cc.skipForwardCommand.removeTarget(nil)
-        cc.skipBackwardCommand.removeTarget(nil)
-        cc.changePlaybackPositionCommand.removeTarget(nil)
-        
-        DispatchQueue.main.async {
-            UIApplication.shared.endReceivingRemoteControlEvents()
-        }
-        
-        isCommandsSetup = false
-        print("[NowPlaying] Remote commands cleaned up")
-    }
-    
-    // MARK: - State Updates (call these whenever data changes)
-    
-    /// Set metadata (title, artist, artwork URL)
-    func setMetadata(title: String?, artist: String?, albumTitle: String?, artworkUrl: String?) {
-        self.title = title
-        self.artist = artist
-        self.albumTitle = albumTitle
-        
-        print("[NowPlaying] Metadata: \(title ?? "nil")")
-        
-        // Load artwork async
-        artworkTask?.cancel()
-        if let urlString = artworkUrl, let url = URL(string: urlString) {
-            artworkTask = URLSession.shared.dataTask(with: url) { [weak self] data, _, _ in
-                if let data = data, let image = UIImage(data: data) {
-                    self?.cachedArtwork = MPMediaItemArtwork(boundsSize: image.size) { _ in image }
-                    print("[NowPlaying] Artwork loaded")
-                    DispatchQueue.main.async { self?.refresh() }
-                }
-            }
-            artworkTask?.resume()
-        }
-        
-        refresh()
-    }
-    
-    /// Update playback state (position, duration, playing)
-    func updatePlayback(position: TimeInterval, duration: TimeInterval, isPlaying: Bool) {
-        self.position = position
-        self.duration = duration
-        self.isPlaying = isPlaying
-        refresh()
-    }
-    
-    /// Clear everything
-    func clear() {
-        artworkTask?.cancel()
-        title = nil
-        artist = nil
-        albumTitle = nil
-        cachedArtwork = nil
-        duration = 0
-        position = 0
-        isPlaying = false
-        MPNowPlayingInfoCenter.default().nowPlayingInfo = nil
-        print("[NowPlaying] Cleared")
-    }
-    
-    // MARK: - Private
-    
-    /// Refresh Now Playing info if we have enough data
-    private func refresh() {
-        guard duration > 0 else {
-            print("[NowPlaying] refresh skipped - duration is 0")
-            return
-        }
-        
-        var info: [String: Any] = [
-            MPMediaItemPropertyPlaybackDuration: duration,
-            MPNowPlayingInfoPropertyElapsedPlaybackTime: position,
-            MPNowPlayingInfoPropertyPlaybackRate: isPlaying ? 1.0 : 0.0
-        ]
-        
-        if let title { info[MPMediaItemPropertyTitle] = title }
-        if let artist { info[MPMediaItemPropertyArtist] = artist }
-        if let albumTitle { info[MPMediaItemPropertyAlbumTitle] = albumTitle }
-        if let cachedArtwork { info[MPMediaItemPropertyArtwork] = cachedArtwork }
-        
-        MPNowPlayingInfoCenter.default().nowPlayingInfo = info
-        print("[NowPlaying] ✅ Set info: title=\(title ?? "nil"), dur=\(Int(duration))s, pos=\(Int(position))s, rate=\(isPlaying ? 1.0 : 0.0)")
-    }
-}

modules/mpv-player/ios/MpvPlayerModule.swift

@@ -43,21 +43,6 @@ public class MpvPlayerModule: Module {
         view.loadVideo(config: config)
       }
 
-      // Now Playing metadata for iOS Control Center and Lock Screen
-      Prop("nowPlayingMetadata") { (view: MpvPlayerView, metadata: [String: Any]?) in
-        guard let metadata = metadata else { return }
-        // Convert Any values to String, filtering out nil/null values
-        var stringMetadata: [String: String] = [:]
-        for (key, value) in metadata {
-          if let stringValue = value as? String {
-            stringMetadata[key] = stringValue
-          }
-        }
-        if !stringMetadata.isEmpty {
-          view.setNowPlayingMetadata(stringMetadata)
-        }
-      }
-
       // Async function to play video
       AsyncFunction("play") { (view: MpvPlayerView) in
         view.play()

modules/mpv-player/ios/MpvPlayerView.swift

@@ -1,7 +1,6 @@
 import AVFoundation
 import CoreMedia
 import ExpoModulesCore
-import MediaPlayer
 import UIKit
 
 /// Configuration for loading a video
@@ -42,6 +41,7 @@ class MpvPlayerView: ExpoView {
 	private var renderer: MPVLayerRenderer?
 	private var videoContainer: UIView!
 	private var pipController: PiPController?
+
 	let onLoad = EventDispatcher()
 	let onPlaybackStateChange = EventDispatcher()
 	let onProgress = EventDispatcher()
@@ -53,14 +53,11 @@ class MpvPlayerView: ExpoView {
 	private var cachedDuration: Double = 0
 	private var intendedPlayState: Bool = false
 	private var _isZoomedToFill: Bool = false
-	
-	// Reference to now playing manager
-	private let nowPlayingManager = MPVNowPlayingManager.shared
 
 	required init(appContext: AppContext? = nil) {
 		super.init(appContext: appContext)
-		setupNotifications()
 		setupView()
+		// Note: Decoder reset is handled automatically via KVO in MPVLayerRenderer
 	}
 
 	private func setupView() {
@@ -112,77 +109,6 @@ class MpvPlayerView: ExpoView {
 		CATransaction.commit()
 	}
 
-	// MARK: - Audio Session & Notifications
-
-	private func setupNotifications() {
-		// Handle audio session interruptions (e.g., incoming calls, other apps playing audio)
-		NotificationCenter.default.addObserver(
-			self, selector: #selector(handleAudioSessionInterruption),
-			name: AVAudioSession.interruptionNotification, object: nil)
-	}
-
-	@objc func handleAudioSessionInterruption(_ notification: Notification) {
-		guard let userInfo = notification.userInfo,
-			  let typeValue = userInfo[AVAudioSessionInterruptionTypeKey] as? UInt,
-			  let type = AVAudioSession.InterruptionType(rawValue: typeValue) else {
-			return
-		}
-		
-		switch type {
-		case .began:
-			// Interruption began - pause the video
-			print("[MPV] Audio session interrupted - pausing video")
-			self.pause()
-			
-		case .ended:
-			// Interruption ended - check if we should resume
-			if let optionsValue = userInfo[AVAudioSessionInterruptionOptionKey] as? UInt {
-				let options = AVAudioSession.InterruptionOptions(rawValue: optionsValue)
-				if options.contains(.shouldResume) {
-					print("[MPV] Audio session interruption ended - can resume")
-					// Don't auto-resume - let user manually resume playback
-				} else {
-					print("[MPV] Audio session interruption ended - should not resume")
-				}
-			}
-			
-		@unknown default:
-			break
-		}
-	}
-	
-	private func setupRemoteCommands() {
-		nowPlayingManager.setupRemoteCommands(
-			playHandler: { [weak self] in self?.play() },
-			pauseHandler: { [weak self] in self?.pause() },
-			toggleHandler: { [weak self] in
-				guard let self else { return }
-				if self.intendedPlayState { self.pause() } else { self.play() }
-			},
-			seekHandler: { [weak self] time in self?.seekTo(position: time) },
-			skipForward: { [weak self] interval in self?.seekBy(offset: interval) },
-			skipBackward: { [weak self] interval in self?.seekBy(offset: -interval) }
-		)
-	}
-
-	// MARK: - Now Playing Info
-
-	func setNowPlayingMetadata(_ metadata: [String: String]) {
-		print("[MPV] setNowPlayingMetadata: \(metadata["title"] ?? "nil")")
-		nowPlayingManager.setMetadata(
-			title: metadata["title"],
-			artist: metadata["artist"],
-			albumTitle: metadata["albumTitle"],
-			artworkUrl: metadata["artworkUri"]
-		)
-	}
-
-	private func clearNowPlayingInfo() {
-		nowPlayingManager.cleanupRemoteCommands()
-		nowPlayingManager.deactivateAudioSession()
-		nowPlayingManager.clear()
-	}
-
 	func loadVideo(config: VideoLoadConfig) {
 		// Skip reload if same URL is already playing
 		if currentURL == config.url {
@@ -223,7 +149,6 @@ class MpvPlayerView: ExpoView {
 
 	func play() {
 		intendedPlayState = true
-		setupRemoteCommands()
 		renderer?.play()
 		pipController?.setPlaybackRate(1.0)
 		pipController?.updatePlaybackState()
@@ -237,17 +162,10 @@ class MpvPlayerView: ExpoView {
 	}
 
 	func seekTo(position: Double) {
-		// Update cached position and Now Playing immediately for smooth Control Center feedback
-		cachedPosition = position
-		syncNowPlaying(isPlaying: !isPaused())
 		renderer?.seek(to: position)
 	}
 
 	func seekBy(offset: Double) {
-		// Update cached position and Now Playing immediately for smooth Control Center feedback
-		let newPosition = max(0, min(cachedPosition + offset, cachedDuration))
-		cachedPosition = newPosition
-		syncNowPlaying(isPlaying: !isPaused())
 		renderer?.seek(by: offset)
 	}
 
@@ -374,32 +292,23 @@ class MpvPlayerView: ExpoView {
 		pipController?.stopPictureInPicture()
 		renderer?.stop()
 		displayLayer.removeFromSuperlayer()
-		clearNowPlayingInfo()
-		NotificationCenter.default.removeObserver(self)
 	}
 }
 
 // MARK: - MPVLayerRendererDelegate
 
 extension MpvPlayerView: MPVLayerRendererDelegate {
-	
-	// MARK: - Single location for Now Playing updates
-	private func syncNowPlaying(isPlaying: Bool) {
-		print("[MPV] syncNowPlaying: pos=\(Int(cachedPosition))s, dur=\(Int(cachedDuration))s, playing=\(isPlaying)")
-		nowPlayingManager.updatePlayback(position: cachedPosition, duration: cachedDuration, isPlaying: isPlaying)
-	}
-	
 	func renderer(_: MPVLayerRenderer, didUpdatePosition position: Double, duration: Double, cacheSeconds: Double) {
 		cachedPosition = position
 		cachedDuration = duration
 		
 		DispatchQueue.main.async { [weak self] in
 			guard let self else { return }
-
+			// Update PiP current time for progress bar
 			if self.pipController?.isPictureInPictureActive == true {
 				self.pipController?.setCurrentTimeFromSeconds(position, duration: duration)
 			}
-
+			
 			self.onProgress([
 				"position": position,
 				"duration": duration,
@@ -412,10 +321,12 @@ extension MpvPlayerView: MPVLayerRendererDelegate {
 	func renderer(_: MPVLayerRenderer, didChangePause isPaused: Bool) {
 		DispatchQueue.main.async { [weak self] in
 			guard let self else { return }
+			// Don't update intendedPlayState here - it's only set by user actions (play/pause)
+			// This prevents PiP UI flicker during seeking
 			
-			print("[MPV] didChangePause: isPaused=\(isPaused), cachedDuration=\(self.cachedDuration)")
+			// Sync timebase rate with actual playback state
 			self.pipController?.setPlaybackRate(isPaused ? 0.0 : 1.0)
-			self.syncNowPlaying(isPlaying: !isPaused)
+			
 			self.onPlaybackStateChange([
 				"isPaused": isPaused,
 				"isPlaying": !isPaused,
@@ -447,13 +358,6 @@ extension MpvPlayerView: MPVLayerRendererDelegate {
 			self.onTracksReady([:])
 		}
 	}
-	
-	func renderer(_: MPVLayerRenderer, didSelectAudioOutput audioOutput: String) {
-		// Audio output is now active - this is the right time to activate audio session and set Now Playing
-		print("[MPV] Audio output ready (\(audioOutput)), activating audio session and syncing Now Playing")
-		nowPlayingManager.activateAudioSession()
-		syncNowPlaying(isPlaying: !isPaused())
-	}
 }
 
 // MARK: - PiPControllerDelegate

modules/mpv-player/src/MpvPlayer.types.ts

@@ -25,13 +25,6 @@ export type OnErrorEventPayload = {
 
 export type OnTracksReadyEventPayload = Record<string, never>;
 
-export type NowPlayingMetadata = {
-  title?: string;
-  artist?: string;
-  albumTitle?: string;
-  artworkUri?: string;
-};
-
 export type MpvPlayerModuleEvents = {
   onChange: (params: ChangeEventPayload) => void;
 };
@@ -55,8 +48,6 @@ export type VideoSource = {
 export type MpvPlayerViewProps = {
   source?: VideoSource;
   style?: StyleProp<ViewStyle>;
-  /** Metadata for iOS Control Center and Lock Screen now playing info */
-  nowPlayingMetadata?: NowPlayingMetadata;
   onLoad?: (event: { nativeEvent: OnLoadEventPayload }) => void;
   onPlaybackStateChange?: (event: {
     nativeEvent: OnPlaybackStateChangePayload;

providers/Downloads/types.ts

@@ -32,12 +32,6 @@ export interface MediaTimeSegment {
   text: string;
 }
 
-export interface Segment {
-  startTime: number;
-  endTime: number;
-  text: string;
-}
-
 /** Represents a single downloaded media item with all necessary metadata for offline playback. */
 export interface DownloadedItem {
   /** The Jellyfin item DTO. */
@@ -56,6 +50,12 @@ export interface DownloadedItem {
   introSegments?: MediaTimeSegment[];
   /** The credit segments for the item. */
   creditSegments?: MediaTimeSegment[];
+  /** The recap segments for the item. */
+  recapSegments?: MediaTimeSegment[];
+  /** The commercial segments for the item. */
+  commercialSegments?: MediaTimeSegment[];
+  /** The preview segments for the item. */
+  previewSegments?: MediaTimeSegment[];
   /** The user data for the item. */
   userData: UserData;
 }
@@ -144,6 +144,12 @@ export type JobStatus = {
   introSegments?: MediaTimeSegment[];
   /** Pre-downloaded credit segments (optional) - downloaded before video starts */
   creditSegments?: MediaTimeSegment[];
+  /** Pre-downloaded recap segments (optional) - downloaded before video starts */
+  recapSegments?: MediaTimeSegment[];
+  /** Pre-downloaded commercial segments (optional) - downloaded before video starts */
+  commercialSegments?: MediaTimeSegment[];
+  /** Pre-downloaded preview segments (optional) - downloaded before video starts */
+  previewSegments?: MediaTimeSegment[];
   /** The audio stream index selected for this download */
   audioStreamIndex?: number;
   /** The subtitle stream index selected for this download */

translations/en.json

@@ -24,6 +24,31 @@
     "too_old_server_text": "Unsupported Jellyfin Server Discovered",
     "too_old_server_description": "Please update Jellyfin to the latest version"
   },
+  "player": {
+    "skip_intro": "Skip Intro",
+    "skip_outro": "Skip Outro",
+    "skip_recap": "Skip Recap",
+    "skip_commercial": "Skip Commercial",
+    "skip_preview": "Skip Preview",
+    "error": "Error",
+    "failed_to_get_stream_url": "Failed to get the stream URL",
+    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
+    "client_error": "Client Error",
+    "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
+    "message_from_server": "Message from Server: {{message}}",
+    "next_episode": "Next Episode",
+    "refresh_tracks": "Refresh Tracks",
+    "audio_tracks": "Audio Tracks:",
+    "playback_state": "Playback State:",
+    "index": "Index:",
+    "continue_watching": "Continue Watching",
+    "go_back": "Go Back",
+    "downloaded_file_title": "You have this file downloaded",
+    "downloaded_file_message": "Do you want to play the downloaded file?",
+    "downloaded_file_yes": "Yes",
+    "downloaded_file_no": "No",
+    "downloaded_file_cancel": "Cancel"
+  },
   "server": {
     "enter_url_to_jellyfin_server": "Enter the URL to your Jellyfin server",
     "server_url_placeholder": "http(s)://your-server.com",
@@ -308,6 +333,21 @@
         "default_playback_speed": "Default Playback Speed",
         "auto_play_next_episode": "Auto-play Next Episode",
         "max_auto_play_episode_count": "Max Auto Play Episode Count",
+        "segment_skip_settings": "Segment Skip Settings",
+        "segment_skip_settings_description": "Configure skip behavior for intros, credits, and other segments",
+        "skip_intro": "Skip Intro",
+        "skip_intro_description": "Action when intro segment is detected",
+        "skip_outro": "Skip Outro/Credits",
+        "skip_outro_description": "Action when outro/credits segment is detected",
+        "skip_recap": "Skip Recap",
+        "skip_recap_description": "Action when recap segment is detected",
+        "skip_commercial": "Skip Commercial",
+        "skip_commercial_description": "Action when commercial segment is detected",
+        "skip_preview": "Skip Preview",
+        "skip_preview_description": "Action when preview segment is detected",
+        "segment_skip_none": "None",
+        "segment_skip_ask": "Show Skip Button",
+        "segment_skip_auto": "Auto Skip",
         "disabled": "Disabled"
       },
       "downloads": {
@@ -590,26 +630,6 @@
   "custom_links": {
     "no_links": "No Links"
   },
-  "player": {
-    "error": "Error",
-    "failed_to_get_stream_url": "Failed to get the stream URL",
-    "an_error_occured_while_playing_the_video": "An error occurred while playing the video. Check logs in settings.",
-    "client_error": "Client Error",
-    "could_not_create_stream_for_chromecast": "Could not create a stream for Chromecast",
-    "message_from_server": "Message from Server: {{message}}",
-    "next_episode": "Next Episode",
-    "refresh_tracks": "Refresh Tracks",
-    "audio_tracks": "Audio Tracks:",
-    "playback_state": "Playback State:",
-    "index": "Index:",
-    "continue_watching": "Continue Watching",
-    "go_back": "Go Back",
-    "downloaded_file_title": "You have this file downloaded",
-    "downloaded_file_message": "Do you want to play the downloaded file?",
-    "downloaded_file_yes": "Yes",
-    "downloaded_file_no": "No",
-    "downloaded_file_cancel": "Cancel"
-  },
   "item_card": {
     "next_up": "Next Up",
     "no_items_to_display": "No Items to Display",

utils/atoms/settings.ts

@@ -134,6 +134,9 @@ export enum VideoPlayer {
   MPV = 0,
 }
 
+// Segment skip behavior options
+export type SegmentSkipMode = "none" | "ask" | "auto";
+
 // Audio transcoding mode - controls how surround audio is handled
 // This controls server-side transcoding behavior for audio streams.
 // MPV decodes via FFmpeg and supports most formats, but mobile devices
@@ -181,6 +184,12 @@ export type Settings = {
   maxAutoPlayEpisodeCount: MaxAutoPlayEpisodeCount;
   autoPlayEpisodeCount: number;
   autoPlayNextEpisode: boolean;
+  // Media segment skip preferences
+  skipIntro: SegmentSkipMode;
+  skipOutro: SegmentSkipMode;
+  skipRecap: SegmentSkipMode;
+  skipCommercial: SegmentSkipMode;
+  skipPreview: SegmentSkipMode;
   // Playback speed settings
   defaultPlaybackSpeed: number;
   playbackSpeedPerMedia: Record<string, number>;
@@ -266,6 +275,12 @@ export const defaultValues: Settings = {
   maxAutoPlayEpisodeCount: { key: "3", value: 3 },
   autoPlayEpisodeCount: 0,
   autoPlayNextEpisode: true,
+  // Media segment skip defaults
+  skipIntro: "ask",
+  skipOutro: "ask",
+  skipRecap: "ask",
+  skipCommercial: "ask",
+  skipPreview: "ask",
   // Playback speed defaults
   defaultPlaybackSpeed: 1.0,
   playbackSpeedPerMedia: {},

utils/segments.ts

@@ -74,10 +74,16 @@ export const getSegmentsForItem = (
 ): {
   introSegments: MediaTimeSegment[];
   creditSegments: MediaTimeSegment[];
+  recapSegments: MediaTimeSegment[];
+  commercialSegments: MediaTimeSegment[];
+  previewSegments: MediaTimeSegment[];
 } => {
   return {
     introSegments: item.introSegments || [],
     creditSegments: item.creditSegments || [],
+    recapSegments: item.recapSegments || [],
+    commercialSegments: item.commercialSegments || [],
+    previewSegments: item.previewSegments || [],
   };
 };
 
@@ -95,6 +101,9 @@ const fetchMediaSegments = async (
 ): Promise<{
   introSegments: MediaTimeSegment[];
   creditSegments: MediaTimeSegment[];
+  recapSegments: MediaTimeSegment[];
+  commercialSegments: MediaTimeSegment[];
+  previewSegments: MediaTimeSegment[];
 } | null> => {
   try {
     const response = await api.axiosInstance.get<MediaSegmentsResponse>(
@@ -102,13 +111,22 @@ const fetchMediaSegments = async (
       {
         headers: getAuthHeaders(api),
         params: {
-          includeSegmentTypes: ["Intro", "Outro"],
+          includeSegmentTypes: [
+            "Intro",
+            "Outro",
+            "Recap",
+            "Commercial",
+            "Preview",
+          ],
         },
       },
     );
 
     const introSegments: MediaTimeSegment[] = [];
     const creditSegments: MediaTimeSegment[] = [];
+    const recapSegments: MediaTimeSegment[] = [];
+    const commercialSegments: MediaTimeSegment[] = [];
+    const previewSegments: MediaTimeSegment[] = [];
 
     response.data.Items.forEach((segment) => {
       const timeSegment: MediaTimeSegment = {
@@ -124,13 +142,27 @@ const fetchMediaSegments = async (
         case "Outro":
           creditSegments.push(timeSegment);
           break;
-        // Optionally handle other types like Recap, Commercial, Preview
+        case "Recap":
+          recapSegments.push(timeSegment);
+          break;
+        case "Commercial":
+          commercialSegments.push(timeSegment);
+          break;
+        case "Preview":
+          previewSegments.push(timeSegment);
+          break;
         default:
           break;
       }
     });
 
-    return { introSegments, creditSegments };
+    return {
+      introSegments,
+      creditSegments,
+      recapSegments,
+      commercialSegments,
+      previewSegments,
+    };
   } catch (_error) {
     // Return null to indicate we should try legacy endpoints
     return null;
@@ -146,6 +178,9 @@ const fetchLegacySegments = async (
 ): Promise<{
   introSegments: MediaTimeSegment[];
   creditSegments: MediaTimeSegment[];
+  recapSegments: MediaTimeSegment[];
+  commercialSegments: MediaTimeSegment[];
+  previewSegments: MediaTimeSegment[];
 }> => {
   const introSegments: MediaTimeSegment[] = [];
   const creditSegments: MediaTimeSegment[] = [];
@@ -184,7 +219,13 @@ const fetchLegacySegments = async (
     console.error("Failed to fetch legacy segments", error);
   }
 
-  return { introSegments, creditSegments };
+  return {
+    introSegments,
+    creditSegments,
+    recapSegments: [],
+    commercialSegments: [],
+    previewSegments: [],
+  };
 };
 
 export const fetchAndParseSegments = async (
@@ -193,6 +234,9 @@ export const fetchAndParseSegments = async (
 ): Promise<{
   introSegments: MediaTimeSegment[];
   creditSegments: MediaTimeSegment[];
+  recapSegments: MediaTimeSegment[];
+  commercialSegments: MediaTimeSegment[];
+  previewSegments: MediaTimeSegment[];
 }> => {
   // Try new API first (Jellyfin 10.11+)
   const newSegments = await fetchMediaSegments(itemId, api);