Type-aware Publication etc (static typing) (#43)

* implemented

* format

* add missing type
This commit is contained in:
Hiroshi Horie
2021-12-01 12:15:09 +07:00
committed by GitHub
parent 004f8c7fdb
commit 44864ff525
5 changed files with 25 additions and 18 deletions
+1 -2
View File
@@ -69,8 +69,7 @@ class _ControlsWidgetState extends State<ControlsWidget> {
void _toggleCamera() async { void _toggleCamera() async {
// //
final track = final track = participant.videoTracks.firstOrNull?.track;
participant.videoTracks.firstOrNull?.track as LocalVideoTrack?;
if (track == null) return; if (track == null) return;
try { try {
+6 -6
View File
@@ -75,7 +75,7 @@ class LocalParticipant extends Participant {
); );
await engine.negotiate(); await engine.negotiate();
final pub = LocalTrackPublication(trackInfo, track, this); final pub = LocalTrackPublication<LocalAudioTrack>(trackInfo, track, this);
addTrackPublication(pub); addTrackPublication(pub);
[events, roomEvents].emit(LocalTrackPublishedEvent( [events, roomEvents].emit(LocalTrackPublishedEvent(
@@ -158,7 +158,7 @@ class LocalParticipant extends Participant {
); );
await engine.negotiate(); await engine.negotiate();
final pub = LocalTrackPublication(trackInfo, track, this); final pub = LocalTrackPublication<LocalVideoTrack>(trackInfo, track, this);
addTrackPublication(pub); addTrackPublication(pub);
[events, roomEvents].emit(LocalTrackPublishedEvent( [events, roomEvents].emit(LocalTrackPublishedEvent(
@@ -241,12 +241,12 @@ class LocalParticipant extends Participant {
super.subscribedTracks.cast<LocalTrackPublication>().toList(); super.subscribedTracks.cast<LocalTrackPublication>().toList();
@override @override
List<LocalTrackPublication> get videoTracks => List<LocalTrackPublication<LocalVideoTrack>> get videoTracks =>
super.videoTracks.cast<LocalTrackPublication>(); super.videoTracks.cast<LocalTrackPublication<LocalVideoTrack>>();
@override @override
List<LocalTrackPublication> get audioTracks => List<LocalTrackPublication<LocalAudioTrack>> get audioTracks =>
super.audioTracks.cast<LocalTrackPublication>(); super.audioTracks.cast<LocalTrackPublication<LocalAudioTrack>>();
} }
extension LocalParticipantTrackSourceExt on LocalParticipant { extension LocalParticipantTrackSourceExt on LocalParticipant {
+14 -6
View File
@@ -1,4 +1,5 @@
import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc; import 'package:flutter_webrtc/flutter_webrtc.dart' as rtc;
import 'package:livekit_client/livekit_client.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import '../constants.dart'; import '../constants.dart';
@@ -7,9 +8,9 @@ import '../extensions.dart';
import '../logger.dart'; import '../logger.dart';
import '../managers/event.dart'; import '../managers/event.dart';
import '../proto/livekit_models.pb.dart' as lk_models; import '../proto/livekit_models.pb.dart' as lk_models;
import '../publication/remote_track_publication.dart';
import '../rtc_engine.dart'; import '../rtc_engine.dart';
import '../track/remote/audio.dart'; import '../track/remote/audio.dart';
import '../publication/remote_track_publication.dart';
import '../track/remote/video.dart'; import '../track/remote/video.dart';
import '../track/track.dart'; import '../track/track.dart';
import '../types.dart'; import '../types.dart';
@@ -25,12 +26,12 @@ class RemoteParticipant extends Participant {
super.subscribedTracks.cast<RemoteTrackPublication>().toList(); super.subscribedTracks.cast<RemoteTrackPublication>().toList();
@override @override
List<RemoteTrackPublication> get videoTracks => List<RemoteTrackPublication<RemoteVideoTrack>> get videoTracks =>
super.videoTracks.cast<RemoteTrackPublication>(); super.videoTracks.cast<RemoteTrackPublication<RemoteVideoTrack>>();
@override @override
List<RemoteTrackPublication> get audioTracks => List<RemoteTrackPublication<RemoteAudioTrack>> get audioTracks =>
super.audioTracks.cast<RemoteTrackPublication>(); super.audioTracks.cast<RemoteTrackPublication<RemoteAudioTrack>>();
RemoteParticipant( RemoteParticipant(
this._engine, this._engine,
@@ -134,7 +135,14 @@ class RemoteParticipant extends Participant {
for (final trackInfo in info.tracks) { for (final trackInfo in info.tracks) {
RemoteTrackPublication? pub = getTrackPublication(trackInfo.sid); RemoteTrackPublication? pub = getTrackPublication(trackInfo.sid);
if (pub == null) { if (pub == null) {
pub = RemoteTrackPublication(trackInfo, this); final RemoteTrackPublication pub;
if (trackInfo.type == lk_models.TrackType.VIDEO) {
pub = RemoteTrackPublication<RemoteVideoTrack>(trackInfo, this);
} else if (trackInfo.type == lk_models.TrackType.AUDIO) {
pub = RemoteTrackPublication<RemoteAudioTrack>(trackInfo, this);
} else {
throw UnexpectedStateException('Unknown track type');
}
newPubs.add(pub); newPubs.add(pub);
addTrackPublication(pub); addTrackPublication(pub);
} else { } else {
@@ -7,11 +7,11 @@ import '../track/local.dart';
import '../track/track.dart'; import '../track/track.dart';
import 'track_publication.dart'; import 'track_publication.dart';
class LocalTrackPublication extends TrackPublication { class LocalTrackPublication<T extends LocalTrack> extends TrackPublication {
final LocalParticipant _participant; final LocalParticipant _participant;
@override @override
covariant LocalTrack? track; covariant T? track;
LocalTrackPublication( LocalTrackPublication(
lk_models.TrackInfo info, lk_models.TrackInfo info,
@@ -31,9 +31,9 @@ class RendererVisibility {
/// Represents a track publication from a RemoteParticipant. Provides methods to /// Represents a track publication from a RemoteParticipant. Provides methods to
/// control if we should subscribe to the track, and its quality (for video). /// control if we should subscribe to the track, and its quality (for video).
class RemoteTrackPublication extends TrackPublication { class RemoteTrackPublication<T extends RemoteTrack> extends TrackPublication {
@override @override
covariant RemoteTrack? track; covariant T? track;
final RemoteParticipant _participant; final RemoteParticipant _participant;
bool _enabled = true; bool _enabled = true;