fix: add name to AudioPublishOptions. (#302)

* fix: add name to AudioPublishOptions.

* remove name for Track.

* remove name for Track.

* update.

* fix flutter analyzer.

* update.

* add Deprecated declaration for Track.name.

* update.
This commit is contained in:
CloudWebRTC
2023-06-14 15:31:21 +08:00
committed by GitHub
parent 4a6694cc3b
commit 193f89806f
13 changed files with 44 additions and 51 deletions
-3
View File
@@ -83,13 +83,11 @@ class LocalAudioTrack extends LocalTrack
// private constructor
@internal
LocalAudioTrack(
String name,
TrackSource source,
rtc.MediaStream stream,
rtc.MediaStreamTrack track,
this.currentOptions,
) : super(
name,
lk_models.TrackType.AUDIO,
source,
stream,
@@ -104,7 +102,6 @@ class LocalAudioTrack extends LocalTrack
final stream = await LocalTrack.createStream(options);
return LocalAudioTrack(
'',
TrackSource.microphone,
stream,
stream.getAudioTracks().first,
-2
View File
@@ -57,13 +57,11 @@ abstract class LocalTrack extends Track {
String? codec;
LocalTrack(
String name,
lk_models.TrackType kind,
TrackSource source,
rtc.MediaStream mediaStream,
rtc.MediaStreamTrack mediaStreamTrack,
) : super(
name,
kind,
source,
mediaStream,
+2 -12
View File
@@ -7,7 +7,6 @@ import '../../proto/livekit_models.pb.dart' as lk_models;
import '../../types/other.dart';
import '../options.dart';
import '../stats.dart';
import '../track.dart';
import 'audio.dart';
import 'local.dart';
@@ -113,13 +112,11 @@ class LocalVideoTrack extends LocalTrack with VideoTrack {
// Private constructor
LocalVideoTrack._(
String name,
TrackSource source,
rtc.MediaStream stream,
rtc.MediaStreamTrack track,
this.currentOptions,
) : super(
name,
lk_models.TrackType.VIDEO,
source,
stream,
@@ -134,7 +131,6 @@ class LocalVideoTrack extends LocalTrack with VideoTrack {
final stream = await LocalTrack.createStream(options);
return LocalVideoTrack._(
Track.cameraName,
TrackSource.camera,
stream,
stream.getVideoTracks().first,
@@ -153,7 +149,6 @@ class LocalVideoTrack extends LocalTrack with VideoTrack {
final stream = await LocalTrack.createStream(options);
return LocalVideoTrack._(
Track.screenShareName,
TrackSource.screenShareVideo,
stream,
stream.getVideoTracks().first,
@@ -175,7 +170,6 @@ class LocalVideoTrack extends LocalTrack with VideoTrack {
List<LocalTrack> tracks = [
LocalVideoTrack._(
Track.screenShareName,
TrackSource.screenShareVideo,
stream,
stream.getVideoTracks().first,
@@ -184,12 +178,8 @@ class LocalVideoTrack extends LocalTrack with VideoTrack {
];
if (stream.getAudioTracks().isNotEmpty) {
tracks.add(LocalAudioTrack(
Track.screenShareName,
TrackSource.screenShareAudio,
stream,
stream.getAudioTracks().first,
const AudioCaptureOptions()));
tracks.add(LocalAudioTrack(TrackSource.screenShareAudio, stream,
stream.getAudioTracks().first, const AudioCaptureOptions()));
}
return tracks;
}
+2 -3
View File
@@ -16,11 +16,10 @@ import '../web/_audio_api.dart' if (dart.library.html) '../web/_audio_html.dart'
class RemoteAudioTrack extends RemoteTrack
with AudioTrack, RemoteAudioManagementMixin {
String? _deviceId;
RemoteAudioTrack(String name, TrackSource source, rtc.MediaStream stream,
rtc.MediaStreamTrack track,
RemoteAudioTrack(
TrackSource source, rtc.MediaStream stream, rtc.MediaStreamTrack track,
{rtc.RTCRtpReceiver? receiver})
: super(
name,
lk_models.TrackType.AUDIO,
source,
stream,
+1 -2
View File
@@ -9,11 +9,10 @@ import '../stats.dart';
import '../track.dart';
abstract class RemoteTrack extends Track {
RemoteTrack(String name, lk_models.TrackType kind, TrackSource source,
RemoteTrack(lk_models.TrackType kind, TrackSource source,
rtc.MediaStream stream, rtc.MediaStreamTrack track,
{rtc.RTCRtpReceiver? receiver})
: super(
name,
kind,
source,
stream,
+2 -3
View File
@@ -10,11 +10,10 @@ import '../stats.dart';
import 'remote.dart';
class RemoteVideoTrack extends RemoteTrack with VideoTrack {
RemoteVideoTrack(String name, TrackSource source, rtc.MediaStream stream,
rtc.MediaStreamTrack track,
RemoteVideoTrack(
TrackSource source, rtc.MediaStream stream, rtc.MediaStreamTrack track,
{rtc.RTCRtpReceiver? receiver})
: super(
name,
lk_models.TrackType.VIDEO,
source,
stream,
+3 -6
View File
@@ -17,10 +17,8 @@ import '../types/other.dart';
abstract class Track extends DisposableChangeNotifier
with EventsEmittable<TrackEvent> {
static const uuid = Uuid();
static const cameraName = 'camera';
static const screenShareName = 'screenshare';
final String name;
@Deprecated('Use TrackPublication.name instead')
final String name = 'Deprecated, please use TrackPublication.name instead';
final lk_models.TrackType kind;
final TrackSource source;
@@ -47,8 +45,7 @@ abstract class Track extends DisposableChangeNotifier
rtc.RTCRtpReceiver? receiver;
Track(this.name, this.kind, this.source, this._mediaStream,
this._mediaStreamTrack,
Track(this.kind, this.source, this._mediaStream, this._mediaStreamTrack,
{this.receiver}) {
// Any event emitted will trigger ChangeNotifier
events.listen((event) {