next-coder
diff --git a/‎.gitignore
Lines changed: 1 addition & 0 deletions b/‎.gitignore
Lines changed: 1 addition & 0 deletions
diff --git a/‎example/lib/src/get_display_media_sample.dart
Lines changed: 5 additions & 0 deletions b/‎example/lib/src/get_display_media_sample.dart
Lines changed: 5 additions & 0 deletions
diff --git a/‎lib/src/web/media_stream_impl.dart
Lines changed: 24 additions & 10 deletions b/‎lib/src/web/media_stream_impl.dart
Lines changed: 24 additions & 10 deletions
diff --git a/‎lib/src/web/media_stream_track_impl.dart
Lines changed: 8 additions & 1 deletion b/‎lib/src/web/media_stream_track_impl.dart
Lines changed: 8 additions & 1 deletion
@@ -21,3 +21,4 @@ example/ios/Flutter/Generated.xcconfig
 example/ios/Flutter/flutter_export_environment.sh
 .vscode/launch.json
 example/.vscode/launch.json
+.dart_tool/package_config_subset
@@ -53,6 +53,11 @@ class _GetDisplayMediaSampleState extends State<GetDisplayMediaSample> {
 
     try {
       var stream = await navigator.getDisplayMedia(mediaConstraints);
+      stream.getVideoTracks()[0].onEnded = () {
+        print(
+            'By adding a listener on onEnded you can: 1) catch stop video sharing on Web');
+      };
+
       _localStream = stream;
       _localRenderer.srcObject = _localStream;
     } catch (e) {
 
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:collection';
 import 'dart:html' as html;
 
 import '../interface/media_stream.dart';
@@ -32,22 +33,35 @@ class MediaStreamWeb extends MediaStream {
     }
   }
 
+  final Map<String, MediaStreamTrack> _audioTracks = {};
+  final Map<String, MediaStreamTrack> _videoTracks = {};
+
   @override
-  List<MediaStreamTrack> getAudioTracks() => jsStream
-      .getAudioTracks()
-      .map((jsTrack) => MediaStreamTrackWeb(jsTrack))
-      .toList();
+  List<MediaStreamTrack> getAudioTracks() {
+    jsStream.getAudioTracks().forEach((jsTrack) => _audioTracks.putIfAbsent(
+          jsTrack.id,
+          () => MediaStreamTrackWeb(jsTrack),
+        ));
+
+    return _audioTracks.values.toList();
+  }
 
   @override
-  List<MediaStreamTrack> getVideoTracks() => jsStream
-      .getVideoTracks()
-      .map((jsTrack) => MediaStreamTrackWeb(jsTrack))
-      .toList();
+  List<MediaStreamTrack> getVideoTracks() {
+    jsStream.getVideoTracks().forEach((jsTrack) => _videoTracks.putIfAbsent(
+          jsTrack.id,
+          () => MediaStreamTrackWeb(jsTrack),
+        ));
+
+    return _videoTracks.values.toList();
+  }
 
   @override
   Future<void> dispose() async {
-    jsStream.getAudioTracks().forEach((track) => track.stop());
-    jsStream.getVideoTracks().forEach((track) => track.stop());
+    getTracks().forEach((element) {
+      element.dispose();
+    });
+
     return super.dispose();
   }
 
 
@@ -5,7 +5,14 @@ import 'dart:js' as js;
 import '../interface/media_stream_track.dart';
 
 class MediaStreamTrackWeb extends MediaStreamTrack {
-  MediaStreamTrackWeb(this.jsTrack);
+  MediaStreamTrackWeb(this.jsTrack) {
+    jsTrack.onEnded.listen((event) {
+      onEnded?.call();
+    });
+    jsTrack.onMute.listen((event) {
+      onMute?.call();
+    });
+  }
 
   final html.MediaStreamTrack jsTrack;