@@ -462,8 +462,8 @@ JsepTransportController::CreateDtlsTransport(
462
462
this , &JsepTransportController::OnTransportWritableState_n);
463
463
dtls->SignalReceivingState .connect (
464
464
this , &JsepTransportController::OnTransportReceivingState_n);
465
- dtls->DtlsHandshakeErrorSignal . AddReceiver (
466
- [ this ](rtc::SSLHandshakeError error) { OnDtlsHandshakeError (error); } );
465
+ dtls->SignalDtlsHandshakeError . connect (
466
+ this , &JsepTransportController:: OnDtlsHandshakeError);
467
467
dtls->ice_transport ()->SignalGatheringState .connect (
468
468
this , &JsepTransportController::OnTransportGatheringState_n);
469
469
dtls->ice_transport ()->SignalCandidateGathered .connect (
@@ -1154,8 +1154,7 @@ void JsepTransportController::OnTransportCandidateGathered_n(
1154
1154
std::string transport_name = transport->transport_name ();
1155
1155
invoker_.AsyncInvoke <void >(
1156
1156
RTC_FROM_HERE, signaling_thread_, [this , transport_name, candidate] {
1157
- SignalIceCandidatesGathered.Send (
1158
- transport_name, std::vector<cricket::Candidate>{candidate});
1157
+ SignalIceCandidatesGathered (transport_name, {candidate});
1159
1158
});
1160
1159
}
1161
1160
@@ -1164,21 +1163,20 @@ void JsepTransportController::OnTransportCandidateError_n(
1164
1163
const cricket::IceCandidateErrorEvent& event) {
1165
1164
RTC_DCHECK (network_thread_->IsCurrent ());
1166
1165
1167
- invoker_.AsyncInvoke <void >(RTC_FROM_HERE, signaling_thread_, [this , event] {
1168
- SignalIceCandidateError.Send (event);
1169
- });
1166
+ invoker_.AsyncInvoke <void >(RTC_FROM_HERE, signaling_thread_,
1167
+ [this , event] { SignalIceCandidateError (event); });
1170
1168
}
1171
1169
void JsepTransportController::OnTransportCandidatesRemoved_n (
1172
1170
cricket::IceTransportInternal* transport,
1173
1171
const cricket::Candidates& candidates) {
1174
1172
invoker_.AsyncInvoke <void >(
1175
1173
RTC_FROM_HERE, signaling_thread_,
1176
- [this , candidates] { SignalIceCandidatesRemoved. Send (candidates); });
1174
+ [this , candidates] { SignalIceCandidatesRemoved (candidates); });
1177
1175
}
1178
1176
void JsepTransportController::OnTransportCandidatePairChanged_n (
1179
1177
const cricket::CandidatePairChangeEvent& event) {
1180
1178
invoker_.AsyncInvoke <void >(RTC_FROM_HERE, signaling_thread_, [this , event] {
1181
- SignalIceCandidatePairChanged. Send (event);
1179
+ SignalIceCandidatePairChanged (event);
1182
1180
});
1183
1181
}
1184
1182
@@ -1319,14 +1317,14 @@ void JsepTransportController::UpdateAggregateStates_n() {
1319
1317
PeerConnectionInterface::kIceConnectionCompleted ) {
1320
1318
// Ensure that we never skip over the "connected" state.
1321
1319
invoker_.AsyncInvoke <void >(RTC_FROM_HERE, signaling_thread_, [this ] {
1322
- SignalStandardizedIceConnectionState. Send (
1320
+ SignalStandardizedIceConnectionState (
1323
1321
PeerConnectionInterface::kIceConnectionConnected );
1324
1322
});
1325
1323
}
1326
1324
standardized_ice_connection_state_ = new_ice_connection_state;
1327
1325
invoker_.AsyncInvoke <void >(
1328
1326
RTC_FROM_HERE, signaling_thread_, [this , new_ice_connection_state] {
1329
- SignalStandardizedIceConnectionState. Send (new_ice_connection_state);
1327
+ SignalStandardizedIceConnectionState (new_ice_connection_state);
1330
1328
});
1331
1329
}
1332
1330
@@ -1380,7 +1378,7 @@ void JsepTransportController::UpdateAggregateStates_n() {
1380
1378
combined_connection_state_ = new_combined_state;
1381
1379
invoker_.AsyncInvoke <void >(RTC_FROM_HERE, signaling_thread_,
1382
1380
[this , new_combined_state] {
1383
- SignalConnectionState. Send (new_combined_state);
1381
+ SignalConnectionState (new_combined_state);
1384
1382
});
1385
1383
}
1386
1384
@@ -1394,10 +1392,10 @@ void JsepTransportController::UpdateAggregateStates_n() {
1394
1392
}
1395
1393
if (ice_gathering_state_ != new_gathering_state) {
1396
1394
ice_gathering_state_ = new_gathering_state;
1397
- invoker_.AsyncInvoke <void >(
1398
- RTC_FROM_HERE, signaling_thread_, [this , new_gathering_state] {
1399
- SignalIceGatheringState. Send (new_gathering_state);
1400
- });
1395
+ invoker_.AsyncInvoke <void >(RTC_FROM_HERE, signaling_thread_,
1396
+ [this , new_gathering_state] {
1397
+ SignalIceGatheringState (new_gathering_state);
1398
+ });
1401
1399
}
1402
1400
}
1403
1401
@@ -1410,7 +1408,7 @@ void JsepTransportController::OnRtcpPacketReceived_n(
1410
1408
1411
1409
void JsepTransportController::OnDtlsHandshakeError (
1412
1410
rtc::SSLHandshakeError error) {
1413
- SignalDtlsHandshakeError. Send (error);
1411
+ SignalDtlsHandshakeError (error);
1414
1412
}
1415
1413
1416
1414
} // namespace webrtc
0 commit comments