8000 [Dart] flutter format. · Condelab/flutter-webrtc@f12392c · GitHub
[go: up one dir, main page]
Skip to content

Commit f12392c

Browse files
cloudwebrtccloudwebrtc
committed
[Dart] flutter format.
1 parent e918edf commit f12392c

13 files changed

+122
-126
lines changed

‎lib/enums.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,4 +106,3 @@ RTCDataChannelState rtcDataChannelStateForString(String state) {
106106
}
107107
return RTCDataChannelState.RTCDataChannelClosed;
108108
}
109-

‎lib/media_recorder.dart

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,28 @@ class MediaRecorder {
1010
static final _random = Random();
1111
final _recorderId = _random.nextInt(0x7FFFFFFF);
1212

13-
Future<void> start(String path, {
14-
MediaStreamTrack videoTrack,
15-
RecorderAudioChannel audioChannel
16-
//TODO: add codec/quality options
17-
}) async {
18-
if (path == null)
19-
throw ArgumentError.notNull("path");
13+
Future<void> start(String path,
14+
{MediaStreamTrack videoTrack, RecorderAudioChannel audioChannel
15+
//TODO: add codec/quality options
16< 8000 code class="diff-text syntax-highlighted-line addition">+
}) async {
17+
if (path == null) throw ArgumentError.notNull("path");
2018
if (audioChannel == null && videoTrack == null)
2119
throw Exception("Neither audio nor video track were provided");
2220

2321
await WebRTC.methodChannel().invokeMethod('startRecordToFile', {
24-
'path' : path,
25-
'audioChannel' : audioChannel?.index,
26-
'videoTrackId' : videoTrack?.id,
27-
'recorderId' : _recorderId
22+
'path': path,
23+
'audioChannel': audioChannel?.index,
24+
'videoTrackId': videoTrack?.id,
25+
'recorderId': _recorderId
2826
});
2927
}
30-
31-
void startWeb(MediaStream stream, {
32-
Function(dynamic blob, bool isLastOne) onDataChunk,
33-
String mimeType = 'video/mp4;codecs=h264'
34-
}) {
28+
29+
void startWeb(MediaStream stream,
30+
{Function(dynamic blob, bool isLastOne) onDataChunk,
31+
String mimeType = 'video/mp4;codecs=h264'}) {
3532
throw "It's for Flutter Web only";
3633
}
3734

38-
Future<dynamic> stop() async =>
39-
await WebRTC.methodChannel().invokeMethod('stopRecordToFile', {
40-
'recorderId' : _recorderId
41-
});
42-
35+
Future<dynamic> stop() async => await WebRTC.methodChannel()
36+
.invokeMethod('stopRecordToFile', {'recorderId': _recorderId});
4337
}

‎lib/media_stream.dart

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@ class MediaStream {
99
String _ownerTag;
1010
List<MediaStreamTrack> _audioTracks = new List<MediaStreamTrack>();
1111
List<MediaStreamTrack> _videoTracks = new List<MediaStreamTrack>();
12-
MediaStream(this._streamId,this._ownerTag);
12+
MediaStream(this._streamId, this._ownerTag);
1313

1414
String get ownerTag => _ownerTag;
1515

16-
void setMediaTracks(List<dynamic> audioTracks, List<dynamic> videoTracks){
17-
16+
void setMediaTracks(List<dynamic> audioTracks, List<dynamic> videoTracks) {
1817
List<MediaStreamTrack> newAudioTracks = new List();
19-
audioTracks.forEach((track){
20-
newAudioTracks.add(new MediaStreamTrack(track["id"], track["label"], track["kind"], track["enabled"]));
18+
audioTracks.forEach((track) {
19+
newAudioTracks.add(new MediaStreamTrack(
20+
track["id"], track["label"], track["kind"], track["enabled"]));
2121
});
2222
_audioTracks = newAudioTracks;
2323

2424
List<MediaStreamTrack> newVideoTracks = new List();
25-
videoTracks.forEach((track){
26-
newVideoTracks.add(new MediaStreamTrack(track["id"], track["label"], track["kind"], track["enabled"]));
25+
videoTracks.forEach((track) {
26+
newVideoTracks.add(new MediaStreamTrack(
27+
track["id"], track["label"], track["kind"], track["enabled"]));
2728
});
2829
_videoTracks = newVideoTracks;
2930
}
@@ -38,40 +39,44 @@ class MediaStream {
3839
List<dynamic> audioTracks = response['audioTracks'];
3940

4041
List<MediaStreamTrack> newAudioTracks = new List();
41-
audioTracks.forEach((track){
42-
newAudioTracks.add(new MediaStreamTrack(track["id"], track["label"], track["kind"], track["enabled"]));
42+
audioTracks.forEach((track) {
43+
newAudioTracks.add(new MediaStreamTrack(
44+
track["id"], track["label"], track["kind"], track["enabled"]));
4345
});
4446
_audioTracks = newAudioTracks;
4547

4648
List<MediaStreamTrack> newVideoTracks = new List();
4749
List<dynamic> videoTracks = response['videoTracks'];
48-
videoTracks.forEach((track){
49-
newVideoTracks.add(new MediaStreamTrack(track["id"], track["label"], track["kind"], track["enabled"]));
50+
videoTracks.forEach((track) {
51+
newVideoTracks.add(new MediaStreamTrack(
52+
track["id"], track["label"], track["kind"], track["enabled"]));
5053
});
5154
_videoTracks = newVideoTracks;
5255
}
5356

5457
String get id => _streamId;
55-
Future<void> addTrack(MediaStreamTrack track, {bool addToNative = true}) async {
58+
Future<void> addTrack(MediaStreamTrack track,
59+
{bool addToNative = true}) async {
5660
if (track.kind == 'audio')
5761
_audioTracks.add(track);
5862
else
5963
_videoTracks.add(track);
6064

61-
if(addToNative)
62-
await _channel.invokeMethod('mediaStreamAddTrack',
63-
<String, dynamic>{'streamId': _streamId, 'trackId': track.id});
65+
if (addToNative)
66+
await _channel.invokeMethod('mediaStreamAddTrack',
67+
<String, dynamic>{'streamId': _streamId, 'trackId': track.id});
6468
}
6569

66-
Future<void> removeTrack(MediaStreamTrack track, {bool removeFromNative = true}) async {
70+
Future<void> removeTrack(MediaStreamTrack track,
71+
{bool removeFromNative = true}) async {
6772
if (track.kind == 'audio')
6873
_audioTracks.removeWhere((it) => it.id == track.id);
6974
else
7075
_videoTracks.removeWhere((it) => it.id == track.id);
7176

72-
if(removeFromNative)
77+
if (removeFromNative)
7378
await _channel.invokeMethod('mediaStreamRemoveTrack',
74-
<String, dynamic>{'streamId': _streamId, 'trackId': track.id});
79+
<String, dynamic>{'streamId': _streamId, 'trackId': track.id});
7580
}
7681

7782
List<MediaStreamTrack> getAudioTracks() {

‎lib/media_stream_track.dart

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,22 @@ class MediaStreamTrack {
2323
String get kind => _kind;
2424
String get id => _trackId;
2525

26-
Future<bool> hasTorch() =>
27-
_channel.invokeMethod(
28-
'mediaStreamTrackHasTorch',
29-
<String, dynamic>{'trackId': _trackId},
30-
);
26+
Future<bool> hasTorch() => _channel.invokeMethod(
27+
'mediaStreamTrackHasTorch',
28+
<String, dynamic>{'trackId': _trackId},
29+
);
3130

32-
Future<void> setTorch(bool torch) =>
33-
_channel.invokeMethod(
34-
'mediaStreamTrackSetTorch',
35-
<String, dynamic>{'trackId': _trackId, 'torch': torch},
36-
);
31+
Future<void> setTorch(bool torch) => _channel.invokeMethod(
32+
'mediaStreamTrackSetTorch',
33+
<String, dynamic>{'trackId': _trackId, 'torch': torch},
34+
);
3735

3836
///Future contains isFrontCamera
3937
///Throws error if switching camera failed
40-
Future<bool> switchCamera() =>
41-
_channel.invokeMethod(
42-
'mediaStreamTrackSwitchCamera',
43-
<String, dynamic>{'trackId': _trackId},
44-
);
38+
Future<bool> switchCamera() => _channel.invokeMethod(
39+
'mediaStreamTrackSwitchCamera',
40+
<String, dynamic>{'trackId': _trackId},
41+
);
4542

4643
void setVolume(double volume) async {
4744
await _channel.invokeMethod(
@@ -67,11 +64,10 @@ class MediaStreamTrack {
6764
}
6865

6966
/// On Flutter Web returns Future<dynamic> which contains data url on success
70-
captureFrame([String filePath]) =>
71-
_channel.invokeMethod(
72-
'captureFrame',
73-
<String, dynamic>{'trackId':_trackId, 'path': filePath},
74-
);
67+
captureFrame([String filePath]) => _channel.invokeMethod(
68+
'captureFrame',
69+
<String, dynamic>{'trackId': _trackId, 'path': filePath},
70+
);
7571

7672
Future<void> dispose() async {
7773
await _channel.invokeMethod(

‎lib/rtc_data_channel.dart

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class RTCDataChannelInit {
3535
}
3636

3737
/// A class that represents a datachannel message.
38-
/// Can either contain binary data as a [Uint8List] or
38+
/// Can either contain binary data as a [Uint8List] or
3939
/// text data as a [String].
4040
class RTCDataChannelMessage {
4141
dynamic _data;
@@ -52,7 +52,7 @@ class RTCDataChannelMessage {
5252
this._data = binary;
5353
this._isBinary = true;
5454
}
55-
55+
5656
/// Tells whether this message contains binary.
5757
/// If this is false, it's a text message.
5858
bool get isBinary => _isBinary;
@@ -82,23 +82,25 @@ class RTCDataChannel {
8282
RTCDataChannelState _state;
8383
MethodChannel _channel = WebRTC.methodChannel();
8484
StreamSubscription<dynamic> _eventSubscription;
85-
85+
8686
/// Get current state.
8787
RTCDataChannelState get state => _state;
8888

8989
/// Event handler for datachannel state changes.
9090
/// Assign this property to listen for state changes.
91-
/// Will be passed one argument, [state], which is an [RTCDataChannelState].
91+
/// Will be passed one argument, [state], which is an [RTCDataChannelState].
9292
RTCDataChannelStateCallback onDataChannelState;
9393

94-
/// Event handler for messages. Assign this property
94+
/// Event handler for messages. Assign this property
9595
/// to listen for messages from this [RTCDataChannel].
9696
/// Will be passed a a [message] argument, which is an [RTCDataChannelMessage] that will contain either
9797
/// binary data as a [Uint8List] or text data as a [String].
9898
RTCDataChannelOnMessageCallback onMessage;
9999

100-
final _stateChangeController = StreamController<RTCDataChannelState>.broadcast(sync: true);
101-
final _messageController = StreamController<RTCDataChannelMessage>.broadcast(sync: true);
100+
final _stateChangeController =
101+
StreamController<RTCDataChannelState>.broadcast(sync: true);
102+
final _messageController =
103+
StreamController<RTCDataChannelMessage>.broadcast(sync: true);
102104

103105
/// Stream of state change events. Emits the new state on change.
104106
/// Closes when the [RTCDataChannel] is closed.
@@ -112,10 +114,10 @@ class RTCDataChannel {
112114
stateChangeStream = _stateChangeController.stream;
113115
messageStream = _messageController.stream;
114116
_eventSubscription = _eventChannelFor(_dataChannelId)
115-
.receiveBroadcastStream()
116-
.listen(eventListener, onError: errorListener);
117+
.receiveBroadcastStream()
118+
.listen(eventListener, onError: errorListener);
117119
}
118-
120+
119121
/// RTCDataChannel event listener.
120122
void eventListener(dynamic event) {
121123
final Map<dynamic, dynamic> map = event;
@@ -130,14 +132,13 @@ class RTCDataChannel {
130132
break;
131133
case 'dataChannelReceiveMessage':
132134
//int dataChannelId = map['id'];
133-
135+
134136
MessageType type = _typeStringToMessageType[map['type']];
135137
dynamic data = map['data'];
136138
RTCDataChannelMessage message;
137139
if (type == MessageType.binary) {
138-
message = RTCDataChannelMessage.fromBinary(data);
139-
}
140-
else {
140+
message = RTCDataChannelMessage.fromBinary(data);
141+
} else {
141142
message = RTCDataChannelMessage(data);
142143
}
143144
if (this.onMessage != null) {
@@ -149,8 +150,7 @@ class RTCDataChannel {
149150
}
150151

151152
EventChannel _eventChannelFor(int dataChannelId) {
152-
return new EventChannel(
153-
'FlutterWebRTC/dataChannelEvent$dataChannelId');
153+
return new EventChannel('FlutterWebRTC/dataChannelEvent$dataChannelId');
154154
}
155155

156156
void errorListener(Object obj) {
@@ -164,21 +164,21 @@ class RTCDataChannel {
164164
/// To send a binary message, pass a binary [RTCDataChannelMessage]
165165
/// constructed with [RTCDataChannelMessage.fromBinary]
166166
Future<void> send(RTCDataChannelMessage message) async {
167-
await _channel.invokeMethod('dataChannelSend',
168-
<String, dynamic>{
169-
'peerConnectionId': _peerConnectionId,
170-
'dataChannelId': _dataChannelId,
171-
'type': message.isBinary ? "binary" : "text",
172-
'data': message.isBinary? message.binary : message.text,
173-
}
174-
);
167+
await _channel.invokeMethod('dataChannelSend', <String, dynamic>{
168+
'peerConnectionId': _peerConnectionId,
169+
'dataChannelId': _dataChannelId,
170+
'type': message.isBinary ? "binary" : "text",
171+
'data': message.isBinary ? message.binary : message.text,
172+
});
175173
}
176174

177175
Future<void> close() async {
178176
await _stateChangeController.close();
179177
await _messageController.close();
180178
await _eventSubscription?.cancel();
181-
await _channel.invokeMethod('dataChannelClose',
182-
<String, dynamic>{'peerConnectionId': _peerConnectionId, 'dataChannelId': _dataChannelId});
179+
await _channel.invokeMethod('dataChannelClose', <String, dynamic>{
180+
'peerConnectionId': _peerConnectionId,
181+
'dataChannelId': _dataChannelId
182+
});
183183
}
184184
}

‎lib/rtc_dtmf_sender.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
2-
class RTCDTMFSender {
3-
4-
}
1+
class RTCDTMFSender {}

‎lib/rtc_ice_candidate.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
class RTCIceCandidate {
32
String candidate;
43
String sdpMid;

0 commit comments

Comments
 (0)
0