Improve web code.

cloudwebrtc · cloudwebrtc · commit 05eeda53e2df · 2020-11-19T21:34:07.000+08:00
diff --git a/lib/src/interface/media_stream_track.dart b/lib/src/interface/media_stream_track.dart
@@ -8,6 +8,7 @@ abstract class MediaStreamTrack {
   StreamTrackCallback onMute;
 
   bool get enabled;
+
   set enabled(bool b);
 
   String get label;
@@ -31,9 +32,8 @@ abstract class MediaStreamTrack {
   Future<dynamic> captureFrame([String filePath]);
 
   Future<bool> hasTorch();
+
   Future<void> setTorch(bool torch);
 
-  Future<void> dispose() {
-    return Future.value();
-  }
+  Future<void> dispose();
 }
diff --git a/lib/src/web/media_stream_impl.dart b/lib/src/web/media_stream_impl.dart
@@ -37,30 +37,27 @@ class MediaStreamWeb extends MediaStream {
 
   @override
   List<MediaStreamTrack> getAudioTracks() {
-    jsStream.getAudioTracks().forEach((jsTrack) => _audioTracks.putIfAbsent(
-          jsTrack.id,
-          () => MediaStreamTrackWeb(jsTrack),
-        ));
-
-    return _audioTracks.values.toList();
+    var audioTracks = <MediaStreamTrack>[];
+    jsStream
+        .getAudioTracks()
+        .forEach((jsTrack) => audioTracks.add(MediaStreamTrackWeb(jsTrack)));
+    return audioTracks;
   }
 
   @override
   List<MediaStreamTrack> getVideoTracks() {
-    jsStream.getVideoTracks().forEach((jsTrack) => _videoTracks.putIfAbsent(
-          jsTrack.id,
-          () => MediaStreamTrackWeb(jsTrack),
-        ));
-
-    return _videoTracks.values.toList();
+    var audioTracks = <MediaStreamTrack>[];
+    jsStream
+        .getVideoTracks()
+        .forEach((jsTrack) => audioTracks.add(MediaStreamTrackWeb(jsTrack)));
+    return audioTracks;
   }
 
   @override
   Future<void> dispose() async {
     getTracks().forEach((element) {
       element.dispose();
     });
-
     return super.dispose();
   }
 
diff --git a/lib/src/web/media_stream_track_impl.dart b/lib/src/web/media_stream_track_impl.dart
@@ -78,9 +78,8 @@ class MediaStreamTrackWeb extends MediaStreamTrack {
   }
 
   @override
-  Future<void> dispose() {
+  Future<void> dispose() async {
     jsTrack.stop();
-    return super.dispose();
   }
 
   @override
diff --git a/lib/src/web/rtc_video_view_impl.dart b/lib/src/web/rtc_video_view_impl.dart
@@ -28,7 +28,9 @@ class _RTCVideoViewState extends State<RTCVideoView> {
   @override
   void initState() {
     super.initState();
-    widget._renderer?.delegate?.addListener(() => setState(() {}));
+    widget._renderer?.delegate?.addListener(() {
+      if (mounted) setState(() {});
+    });
   }
 
   Widget buildVideoElementView(RTCVideoViewObjectFit objFit, bool mirror) {

Original file line number	Diff line number	Diff line change
`@@ -78,9 +78,8 @@ class MediaStreamTrackWeb extends MediaStreamTrack {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@override`
`81`		`- Future<void> dispose() {`
	`81`	`+ Future<void> dispose() async {`
`82`	`82`	`jsTrack.stop();`
`83`		`- return super.dispose();`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`@override`