Merge pull request #399 from pinpong/stateFix

removed AutomaticKeepAliveClientMixin to fix/prevent unwanted behavior

Author: illia-romanenko

flutter_vlc_player/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.4.0
+* **Possible breaking Change**: Removed [AutomaticKeepAliveClientMixin](https://api.flutter.dev/flutter/widgets/AutomaticKeepAliveClientMixin-mixin.html) from plugin widget
+
 ## 7.3.1
 * Restore Flutter 3.3-3.7 compatibility
   Credits to Yang Fang (https://github.com/yangsfang)

flutter_vlc_player/android/src/main/java/software/solid/fluttervlcplayer/FlutterVlcPlayer.java

@@ -70,6 +70,7 @@ public void dispose() {
         rendererEventChannel.setStreamHandler(null);
         if (mediaPlayer != null) {
             mediaPlayer.stop();
+            mediaPlayer.setEventListener(null);
             mediaPlayer.getVLCVout().detachViews();
             mediaPlayer.release();
             mediaPlayer = null;
@@ -125,7 +126,7 @@ public void onCancel(Object o) {
     // }
 
     public void initialize(List<String> options) {
-        this.options = options; 
+        this.options = options;
         libVLC = new LibVLC(context, options);
         mediaPlayer = new MediaPlayer(libVLC);
         setupVlcMediaPlayer();
@@ -242,19 +243,19 @@ public void onEvent(MediaPlayer.Event event) {
     }
 
     void play() {
-        if (mediaPlayer != null) {
+        if (mediaPlayer != null && !mediaPlayer.isPlaying()) {
             mediaPlayer.play();
         }
     }
 
     void pause() {
-        if (mediaPlayer != null) {
+        if (mediaPlayer != null && mediaPlayer.isPlaying()) {
             mediaPlayer.pause();
         }
     }
 
     void stop() {
-        if (mediaPlayer != null) {
+        if (mediaPlayer != null && mediaPlayer.isPlaying()) {
             mediaPlayer.stop();
         }
     }
@@ -273,7 +274,9 @@ void setStreamUrl(String url, boolean isAssetUrl, boolean autoPlay, long hwAcc)
         if (mediaPlayer == null) return;
 
         try {
-            mediaPlayer.stop();
+            if (mediaPlayer.isPlaying()) {
+                mediaPlayer.stop();
+            }
             //
             Media media;
             if (isAssetUrl)
@@ -295,15 +298,14 @@ void setStreamUrl(String url, boolean isAssetUrl, boolean autoPlay, long hwAcc)
                 media.addOption(":no-omxil-dr");
             }
             if (options != null) {
-                for (String option: options)
+                for (String option : options)
                     media.addOption(option);
             }
             mediaPlayer.setMedia(media);
             media.release();
             //
-            mediaPlayer.play();
-            if (!autoPlay) {
-                mediaPlayer.stop();
+            if (autoPlay) {
+                mediaPlayer.play();
             }
         } catch (IOException e) {
             log(e.getMessage());
@@ -350,7 +352,7 @@ void seekTo(int location) {
 
     long getPosition() {
         if (mediaPlayer == null) return -1;
-        
+
         return mediaPlayer.getTime();
     }
 
@@ -612,8 +614,7 @@ void castToRenderer(String rendererDevice) {
         if (isDisposed) {
             return;
         }
-        boolean isPlaying = mediaPlayer.isPlaying();
-        if (isPlaying)
+        if (mediaPlayer.isPlaying())
             mediaPlayer.pause();
 
         // if you set it to null, it will start to render normally (i.e. locally) again
@@ -644,6 +645,7 @@ Boolean startRecording(String directory) {
     }
 
     Boolean stopRecording() {
+        if (mediaPlayer == null) return true;
         return mediaPlayer.record(null);
     }
 

flutter_vlc_player/example/lib/vlc_player_with_controls.dart

@@ -23,8 +23,7 @@ class VlcPlayerWithControls extends StatefulWidget {
   VlcPlayerWithControlsState createState() => VlcPlayerWithControlsState();
 }
 
-class VlcPlayerWithControlsState extends State<VlcPlayerWithControls>
-    with AutomaticKeepAliveClientMixin {
+class VlcPlayerWithControlsState extends State<VlcPlayerWithControls> {
   static const _playerControlsBgColor = Colors.black87;
   static const _numberPositionOffset = 8.0;
   static const _recordingPositionOffset = 10.0;
@@ -60,9 +59,6 @@ class VlcPlayerWithControlsState extends State<VlcPlayerWithControls>
   List<double> playbackSpeeds = [0.5, 1.0, 2.0];
   int playbackSpeedIndex = 1;
 
-  @override
-  bool get wantKeepAlive => true;
-
   @override
   void initState() {
     super.initState();
@@ -122,8 +118,6 @@ class VlcPlayerWithControlsState extends State<VlcPlayerWithControls>
 
   @override
   Widget build(BuildContext context) {
-    super.build(context);
-
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [

flutter_vlc_player/ios/Classes/VlcViewController.swift

@@ -327,7 +327,11 @@ public class VLCViewController: NSObject, FlutterPlatformView {
     }
 
     public func dispose(){
-        //todo: dispose player & event handlers
+        self.mediaEventChannel.setStreamHandler(nil);
+        self.rendererEventChannel.setStreamHandler(nil);
+        self.rendererdiscoverers.removeAll()
+        self.rendererEventChannelHandler.renderItems.removeAll()
+        self.vlcMediaPlayer.stop()
     }
 
     func setMediaPlayerUrl(uri: String, isAssetUrl: Bool, autoPlay: Bool, hwAcc: Int, options: [String]){

flutter_vlc_player/lib/src/flutter_vlc_player.dart

@@ -33,16 +33,12 @@ class VlcPlayer extends StatefulWidget {
   _VlcPlayerState createState() => _VlcPlayerState();
 }
 
-class _VlcPlayerState extends State<VlcPlayer>
-    with AutomaticKeepAliveClientMixin {
+class _VlcPlayerState extends State<VlcPlayer> {
   bool _isInitialized = false;
 
   //ignore: avoid-late-keyword
   late VoidCallback _listener;
 
-  @override
-  bool get wantKeepAlive => true;
-
   _VlcPlayerState() {
     _listener = () {
       if (!mounted) return;
@@ -67,8 +63,6 @@ class _VlcPlayerState extends State<VlcPlayer>
 
   @override
   Widget build(BuildContext context) {
-    super.build(context);
-
     return AspectRatio(
       aspectRatio: widget.aspectRatio,
       child: Stack(

flutter_vlc_player/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_vlc_player
 description: A VLC-powered alternative to Flutter's video_player. Supports multiple players on one screen.
-version: 7.3.1
+version: 7.4.0
 homepage: https://github.com/solid-software/flutter_vlc_player/
 
 environment:
@@ -19,7 +19,7 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
-  
+
   flutter_vlc_player_platform_interface: ^2.0.3
   meta: ^1.8.0