Rtcdtmfsender initilized in rtc_peerconnection.dart and added dtmfsender getter

xyzbilal · xyzbilal · commit b637a161825a · 2020-09-12T21:14:22.000+03:00
diff --git a/lib/src/rtc_dtmf_sender.dart b/lib/src/rtc_dtmf_sender.dart
@@ -4,13 +4,15 @@ import 'package:flutter/services.dart';
 
 class RTCDTMFSender {
   // peer connection Id must be defined as a variable where this function will be called.
+  final String _peerConnectionId;
 
-  static Future<void> sendDtmf(String peerConnectionId, String tone,
-      {double duration, double gap}) async {
+  RTCDTMFSender(this._peerConnectionId);
+
+  Future<void> sendDtmf(String tone, {var duration, var gap}) async {
     final MethodChannel _channel = WebRTC.methodChannel();
 
-    double _duration = 0.0;
-    double _gap = 0.0;
+    var _duration = Platform.isIOS ? 0.5 : 500;
+    var _gap = Platform.isIOS ? 0.05 : 50;
     // IOS accepts gap and duration in seconds so conversion to be needed
     if (duration != null) {
       if (Platform.isIOS) {
@@ -19,6 +21,7 @@ class RTCDTMFSender {
         _duration = duration;
       }
     }
+
     if (gap != null) {
       if (Platform.isIOS) {
         _gap = gap / 1000;
@@ -28,7 +31,7 @@ class RTCDTMFSender {
     }
 
     await _channel.invokeMethod('sendDtmf', <String, dynamic>{
-      'peerConnectionId': peerConnectionId,
+      'peerConnectionId': _peerConnectionId,
       'tone': tone,
       'duration': _duration,
       'gap': _gap,
diff --git a/lib/src/rtc_peerconnection.dart b/lib/src/rtc_peerconnection.dart
@@ -6,6 +6,7 @@ import 'enums.dart';
 import 'media_stream.dart';
 import 'media_stream_track.dart';
 import 'rtc_data_channel.dart';
+import 'rtc_dtmf_sender.dart';
 import 'rtc_ice_candidate.dart';
 import 'rtc_session_description.dart';
 import 'rtc_stats_report.dart';
@@ -34,6 +35,8 @@ class RTCPeerConnection {
     _eventSubscription = _eventChannelFor(_peerConnectionId)
         .receiveBroadcastStream()
         .listen(eventListener, onError: errorListener);
+
+    _dtmfSender = RTCDTMFSender(_peerConnectionId);
   }
 
   // private:
@@ -47,7 +50,7 @@ class RTCPeerConnection {
   RTCSignalingState _signalingState;
   RTCIceGatheringState _iceGatheringState;
   RTCIceConnectionState _iceConnectionState;
-
+  RTCDTMFSender _dtmfSender;
   // public: delegate
   SignalingStateCallback onSignalingState;
   IceGatheringStateCallback onIceGatheringState;
@@ -58,6 +61,7 @@ class RTCPeerConnection {
   AddTrackCallback onAddTrack;
   RemoveTrackCallback onRemoveTrack;
   RTCDataChannelCallback onDataChannel;
+
   dynamic onRenegotiationNeeded;
 
   final Map<String, dynamic> defaultSdpConstraints = {
@@ -74,7 +78,7 @@ class RTCPeerConnection {
 
   RTCIceConnectionState get iceConnectionState => _iceConnectionState;
 
-  String get peerConnectionId => _peerConnectionId;
+  RTCDTMFSender get dtmfSender => _dtmfSender;
 
   /*
    * PeerConnection event listener.
