From 69b948f3d09aeb6d795fe948471d38ef0d57d9bf Mon Sep 17 00:00:00 2001
From: Alejandro Armas <58491232+mycroftsnm@users.noreply.github.com>
Date: Tue, 11 Jun 2024 13:14:49 -0300
Subject: [PATCH] fix(mobile): Motion Photos stopping music (#10151)

Add videoPlayer opt to prevent motionPhotos pausing music
---
 .../asset_viewer/video_player_controller_provider.dart         | 3 +++
 .../asset_viewer/video_player_controller_provider.g.dart       | 2 +-
 mobile/lib/providers/map/map_state.provider.g.dart             | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mobile/lib/providers/asset_viewer/video_player_controller_provider.dart b/mobile/lib/providers/asset_viewer/video_player_controller_provider.dart
index f0f358343dc2a..4f6c6f30ead7e 100644
--- a/mobile/lib/providers/asset_viewer/video_player_controller_provider.dart
+++ b/mobile/lib/providers/asset_viewer/video_player_controller_provider.dart
@@ -31,6 +31,9 @@ Future<VideoPlayerController> videoPlayerController(
     controller = VideoPlayerController.networkUrl(
       url,
       httpHeaders: {"x-immich-user-token": accessToken},
+      videoPlayerOptions: asset.livePhotoVideoId != null
+          ? VideoPlayerOptions(mixWithOthers: true)
+          : VideoPlayerOptions(mixWithOthers: false),
     );
   }
 
diff --git a/mobile/lib/providers/asset_viewer/video_player_controller_provider.g.dart b/mobile/lib/providers/asset_viewer/video_player_controller_provider.g.dart
index e447304b368b9..cfef55457d76f 100644
--- a/mobile/lib/providers/asset_viewer/video_player_controller_provider.g.dart
+++ b/mobile/lib/providers/asset_viewer/video_player_controller_provider.g.dart
@@ -7,7 +7,7 @@ part of 'video_player_controller_provider.dart';
 // **************************************************************************
 
 String _$videoPlayerControllerHash() =>
-    r'40b31f7b1a73fab84c311b0f06bedf5322143cd9';
+    r'642469a44287188a7c301f5cad3df3e23c84d85c';
 
 /// Copied from Dart SDK
 class _SystemHash {
diff --git a/mobile/lib/providers/map/map_state.provider.g.dart b/mobile/lib/providers/map/map_state.provider.g.dart
index e12c69d7174c7..eff7b4b68e60f 100644
--- a/mobile/lib/providers/map/map_state.provider.g.dart
+++ b/mobile/lib/providers/map/map_state.provider.g.dart
@@ -6,7 +6,7 @@ part of 'map_state.provider.dart';
 // RiverpodGenerator
 // **************************************************************************
 
-String _$mapStateNotifierHash() => r'87a8623f726d438d115d5a15609c71372726ee2f';
+String _$mapStateNotifierHash() => r'31fafe17aa85c48379a22ed3db3cc94af59ce5b8';
 
 /// See also [MapStateNotifier].
 @ProviderFor(MapStateNotifier)