feat: re-do os media controls

Author: edde746

android/app/src/main/AndroidManifest.xml

@@ -3,8 +3,7 @@
     <!-- Internet access permissions -->
     <uses-permission android:name="android.permission.INTERNET"/>
 
-    <!-- Audio service permissions -->
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <!-- Media session permissions for OS media controls -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
 
@@ -45,23 +44,6 @@
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
-
-        <!-- Audio service -->
-        <service android:name="com.ryanheise.audioservice.AudioService"
-            android:foregroundServiceType="mediaPlayback"
-            android:exported="true" tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.media.browse.MediaBrowserService" />
-            </intent-filter>
-        </service>
-
-        <!-- Media button receiver -->
-        <receiver android:name="com.ryanheise.audioservice.MediaButtonReceiver"
-            android:exported="true" tools:ignore="Instantiatable">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver>
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and

android/app/src/main/kotlin/com/example/flutter_application_1/MainActivity.kt

@@ -1,5 +1,5 @@
 package com.edde746.plezy
 
-import com.ryanheise.audioservice.AudioServiceActivity
+import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity : AudioServiceActivity()
+class MainActivity : FlutterActivity()

ios/Podfile.lock

@@ -1,14 +1,11 @@
 PODS:
-  - audio_service (0.0.1):
-    - Flutter
-    - FlutterMacOS
-  - audio_session (0.0.1):
-    - Flutter
   - Flutter (1.0.0)
   - media_kit_libs_ios_video (1.0.4):
     - Flutter
   - media_kit_video (0.0.1):
     - Flutter
+  - os_media_controls (0.0.1):
+    - Flutter
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
@@ -28,11 +25,10 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
-  - audio_service (from `.symlinks/plugins/audio_service/darwin`)
-  - audio_session (from `.symlinks/plugins/audio_session/ios`)
   - Flutter (from `Flutter`)
   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
   - media_kit_video (from `.symlinks/plugins/media_kit_video/ios`)
+  - os_media_controls (from `.symlinks/plugins/os_media_controls/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
@@ -42,16 +38,14 @@ DEPENDENCIES:
   - wakelock_plus (from `.symlinks/plugins/wakelock_plus/ios`)
 
 EXTERNAL SOURCES:
-  audio_service:
-    :path: ".symlinks/plugins/audio_service/darwin"
-  audio_session:
-    :path: ".symlinks/plugins/audio_session/ios"
   Flutter:
     :path: Flutter
   media_kit_libs_ios_video:
     :path: ".symlinks/plugins/media_kit_libs_ios_video/ios"
   media_kit_video:
     :path: ".symlinks/plugins/media_kit_video/ios"
+  os_media_controls:
+    :path: ".symlinks/plugins/os_media_controls/ios"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -68,11 +62,10 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/wakelock_plus/ios"
 
 SPEC CHECKSUMS:
-  audio_service: aa99a6ba2ae7565996015322b0bb024e1d25c6fd
-  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   media_kit_libs_ios_video: 5a18affdb97d1f5d466dc79988b13eff6c5e2854
   media_kit_video: 1746e198cb697d1ffb734b1d05ec429d1fcd1474
+  os_media_controls: 86dceab6245a5325af90fc0fdebe243c42d789b4
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
   path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb

ios/Runner/AppDelegate.swift

@@ -1,5 +1,6 @@
 import Flutter
 import UIKit
+import AVFoundation
 
 @main
 @objc class AppDelegate: FlutterAppDelegate {
@@ -8,6 +9,18 @@ import UIKit
     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
   ) -> Bool {
     GeneratedPluginRegistrant.register(with: self)
+
+    // Configure audio session for media playback
+    do {
+      let session = AVAudioSession.sharedInstance()
+      try session.setCategory(.playback, mode: .default)
+      try session.setActive(true)
+    } catch {
+      print("Failed to configure audio session: \(error)")
+    }
+
+    application.beginReceivingRemoteControlEvents()
+
     return super.application(application, didFinishLaunchingWithOptions: launchOptions)
   }
 }

lib/screens/video_player_screen.dart

@@ -4,6 +4,7 @@ import 'package:flutter/services.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:media_kit_video/media_kit_video.dart';
 import 'package:provider/provider.dart';
+import 'package:os_media_controls/os_media_controls.dart';
 import '../models/plex_metadata.dart';
 import '../models/plex_user_profile.dart';
 import '../providers/plex_client_provider.dart';
@@ -14,7 +15,6 @@ import '../widgets/video_controls/video_controls.dart';
 import '../utils/language_codes.dart';
 import '../utils/app_logger.dart';
 import '../services/settings_service.dart';
-import '../services/audio_service_manager.dart';
 import '../utils/orientation_helper.dart';
 import '../utils/video_player_navigation.dart';
 import '../utils/platform_detector.dart';
@@ -56,6 +56,8 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
   StreamSubscription<String>? _errorSubscription;
   StreamSubscription<bool>? _playingSubscription;
   StreamSubscription<bool>? _completedSubscription;
+  StreamSubscription<Duration>? _positionSubscription;
+  StreamSubscription<dynamic>? _mediaControlSubscription;
   bool _isReplacingWithVideo =
       false; // Flag to skip orientation restoration during video-to-video navigation
 
@@ -215,14 +217,19 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
       // Listen to MPV errors
       _errorSubscription = player!.stream.error.listen(_onPlayerError);
 
+      // Listen to position updates for media controls
+      _positionSubscription = player!.stream.position.listen((_) {
+        _updateMediaControlsPosition();
+      });
+
+      // Initialize OS media controls
+      _initializeMediaControls();
+
       // Start periodic progress updates
       _startProgressTracking();
 
       // Load next/previous episodes
       _loadAdjacentEpisodes();
-
-      // Initialize audio service for OS media controls
-      _initializeAudioService();
     } catch (e) {
       appLogger.e('Failed to initialize player', error: e);
       if (mounted) {
@@ -279,52 +286,12 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
           _nextEpisode = next;
           _previousEpisode = previous;
         });
-
-        // Update audio handler navigation availability
-        _updateAudioHandlerNavigation();
       }
     } catch (e) {
       // Silently handle errors
     }
   }
 
-  Future<void> _initializeAudioService() async {
-    try {
-      if (player == null) return;
-
-      final clientProvider = context.plexClient;
-      final client = clientProvider.client;
-      if (client == null) return;
-
-      final audioManager = AudioServiceManager.instance;
-
-      // Initialize audio service (will only happen once)
-      await audioManager.initialize(
-        player: player!,
-        plexServerUrl: client.config.baseUrl,
-        authToken: client.config.token ?? '',
-        onSkipToNext: _nextEpisode != null ? _playNext : null,
-        onSkipToPrevious: _previousEpisode != null ? _playPrevious : null,
-      );
-
-      // Update media item with current content
-      audioManager.updateMediaItem(widget.metadata);
-
-      appLogger.d('Audio service initialized/updated successfully');
-    } catch (e) {
-      appLogger.e('Failed to initialize audio service', error: e);
-      // Continue playback even if audio service fails
-    }
-  }
-
-  void _updateAudioHandlerNavigation() {
-    final audioManager = AudioServiceManager.instance;
-    audioManager.updateNavigation(
-      onNext: _nextEpisode != null ? _playNext : null,
-      onPrevious: _previousEpisode != null ? _playPrevious : null,
-    );
-  }
-
   Future<void> _startPlayback() async {
     try {
       final clientProvider = context.plexClient;
@@ -519,17 +486,11 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     _completedSubscription?.cancel();
     _logSubscription?.cancel();
     _errorSubscription?.cancel();
+    _positionSubscription?.cancel();
+    _mediaControlSubscription?.cancel();
 
-    // Handle audio service based on navigation intent
-    if (_isReplacingWithVideo) {
-      // Switching to another episode: pause but keep notification visible
-      // The new VideoPlayerScreen will update the notification
-      AudioServiceManager.instance.pause();
-    } else {
-      // Truly exiting player: clear notification but keep singleton alive
-      // This allows controls to reappear when playing again
-      AudioServiceManager.instance.clearNotification();
-    }
+    // Clear OS media controls completely
+    OsMediaControls.clear();
 
     // Send final stopped state
     _sendProgress('stopped');
@@ -1123,6 +1084,9 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
   void _onPlayingStateChanged(bool isPlaying) {
     // Send timeline update when playback state changes
     _sendProgress(isPlaying ? 'playing' : 'paused');
+
+    // Update OS media controls playback state
+    _updateMediaControlsPlaybackState();
   }
 
   void _sendProgress(String state) {
@@ -1185,6 +1149,129 @@ class VideoPlayerScreenState extends State<VideoPlayerScreen> {
     appLogger.e('[MPV ERROR] $error');
   }
 
+  // OS Media Controls Integration
+
+  void _initializeMediaControls() async {
+    // Listen to media control events
+    _mediaControlSubscription = OsMediaControls.controlEvents.listen((event) {
+      if (event is PlayEvent) {
+        player?.play();
+      } else if (event is PauseEvent) {
+        player?.pause();
+      } else if (event is SeekEvent) {
+        player?.seek(event.position);
+      } else if (event is NextTrackEvent) {
+        if (_nextEpisode != null) {
+          _playNext();
+        }
+      } else if (event is PreviousTrackEvent) {
+        if (_previousEpisode != null) {
+          _playPrevious();
+        }
+      }
+    });
+
+    // Enable/disable next/previous track controls based on content type
+    final isEpisode = widget.metadata.type.toLowerCase() == 'episode';
+    if (isEpisode) {
+      // Enable next/previous track controls for episodes
+      await OsMediaControls.enableControls([
+        MediaControl.next,
+        MediaControl.previous,
+      ]);
+    } else {
+      // Disable next/previous track controls for movies
+      await OsMediaControls.disableControls([
+        MediaControl.next,
+        MediaControl.previous,
+      ]);
+    }
+
+    // Set initial metadata
+    await _updateMediaMetadata();
+  }
+
+  Future<void> _updateMediaMetadata() async {
+    if (!mounted) {
+      appLogger.w('Cannot update media metadata: widget not mounted');
+      return;
+    }
+
+    final metadata = widget.metadata;
+    final clientProvider = context.plexClient;
+    final client = clientProvider.client;
+
+    // Get artwork URL
+    String? artworkUrl;
+    if (client == null) {
+      appLogger.w('Cannot get artwork URL for media controls: Plex client is null');
+    } else {
+      final thumbUrl = metadata.type.toLowerCase() == 'episode'
+          ? metadata.grandparentThumb ?? metadata.thumb
+          : metadata.thumb;
+
+      if (thumbUrl != null) {
+        try {
+          artworkUrl = client.getThumbnailUrl(thumbUrl);
+          appLogger.d('Artwork URL for media controls: $artworkUrl');
+        } catch (e) {
+          appLogger.w('Failed to get artwork URL for media controls', error: e);
+        }
+      } else {
+        appLogger.d('No thumbnail URL available for media controls');
+      }
+    }
+
+    // Build title/artist based on content type
+    String title = metadata.title;
+    String? artist;
+    String? album;
+
+    if (metadata.type.toLowerCase() == 'episode') {
+      title = metadata.title;
+      artist = metadata.grandparentTitle; // Show name
+      if (metadata.parentIndex != null) {
+        album = 'Season ${metadata.parentIndex}';
+      }
+    }
+
+    await OsMediaControls.setMetadata(MediaMetadata(
+      title: title,
+      artist: artist,
+      album: album,
+      duration: metadata.duration != null
+          ? Duration(milliseconds: metadata.duration!)
+          : null,
+      artworkUrl: artworkUrl,
+    ));
+
+    // Set initial playback state
+    _updateMediaControlsPlaybackState();
+  }
+
+  void _updateMediaControlsPlaybackState() {
+    if (player == null) return;
+
+    OsMediaControls.setPlaybackState(MediaPlaybackState(
+      state: player!.state.playing ? PlaybackState.playing : PlaybackState.paused,
+      position: player!.state.position,
+      speed: player!.state.rate,
+    ));
+  }
+
+  void _updateMediaControlsPosition() {
+    if (player == null) return;
+
+    // Only update if playing to avoid excessive updates
+    if (player!.state.playing) {
+      OsMediaControls.setPlaybackState(MediaPlaybackState(
+        state: PlaybackState.playing,
+        position: player!.state.position,
+        speed: player!.state.rate,
+      ));
+    }
+  }
+
   Future<void> _playNext() async {
     if (_nextEpisode == null || _isLoadingNext) return;