[WebRTC] Expose more of the WebRTC API.

Add get_gathering_state() returning the iceGatheringState of the
connection.

Add get_signaling_state() returning the signalingState of the
connection.

Improve JS library.

1 files changed, 11 insertions, 3 deletions

diff --git a/modules/webrtc/webrtc_peer_connection_js.h b/modules/webrtc/webrtc_peer_connection_js.h
index 50266129e4..e62ad6af28 100644
--- a/modules/webrtc/webrtc_peer_connection_js.h
+++ b/modules/webrtc/webrtc_peer_connection_js.h
@@ -37,11 +37,13 @@
 
 extern "C" {
 typedef void (*RTCOnIceConnectionStateChange)(void *p_obj, int p_state);
+typedef void (*RTCOnIceGatheringStateChange)(void *p_obj, int p_state);
+typedef void (*RTCOnSignalingStateChange)(void *p_obj, int p_state);
 typedef void (*RTCOnIceCandidate)(void *p_obj, const char *p_mid, int p_mline_idx, const char *p_candidate);
 typedef void (*RTCOnDataChannel)(void *p_obj, int p_id);
 typedef void (*RTCOnSession)(void *p_obj, const char *p_type, const char *p_sdp);
 typedef void (*RTCOnError)(void *p_obj);
-extern int godot_js_rtc_pc_create(const char *p_config, void *p_obj, RTCOnIceConnectionStateChange p_on_state_change, RTCOnIceCandidate p_on_candidate, RTCOnDataChannel p_on_datachannel);
+extern int godot_js_rtc_pc_create(const char *p_config, void *p_obj, RTCOnIceConnectionStateChange p_on_connection_state_change, RTCOnIceGatheringStateChange p_on_gathering_state_change, RTCOnSignalingStateChange p_on_signaling_state_change, RTCOnIceCandidate p_on_candidate, RTCOnDataChannel p_on_datachannel);
 extern void godot_js_rtc_pc_close(int p_id);
 extern void godot_js_rtc_pc_destroy(int p_id);
 extern void godot_js_rtc_pc_offer_create(int p_id, void *p_obj, RTCOnSession p_on_session, RTCOnError p_on_error);
@@ -55,10 +57,14 @@ class WebRTCPeerConnectionJS : public WebRTCPeerConnection {
 	GDCLASS(WebRTCPeerConnectionJS, WebRTCPeerConnection);
 
 private:
-	int _js_id;
-	ConnectionState _conn_state;
+	int _js_id = 0;
+	ConnectionState _conn_state = STATE_NEW;
+	GatheringState _gathering_state = GATHERING_STATE_NEW;
+	SignalingState _signaling_state = SIGNALING_STATE_STABLE;
 
 	static void _on_connection_state_changed(void *p_obj, int p_state);
+	static void _on_gathering_state_changed(void *p_obj, int p_state);
+	static void _on_signaling_state_changed(void *p_obj, int p_state);
 	static void _on_ice_candidate(void *p_obj, const char *p_mid_name, int p_mline_idx, const char *p_candidate);
 	static void _on_data_channel(void *p_obj, int p_channel);
 	static void _on_session_created(void *p_obj, const char *p_type, const char *p_session);
@@ -66,6 +72,8 @@ private:
 
 public:
 	virtual ConnectionState get_connection_state() const override;
+	virtual GatheringState get_gathering_state() const override;
+	virtual SignalingState get_signaling_state() const override;
 
 	virtual Error initialize(Dictionary configuration = Dictionary()) override;
 	virtual Ref<WebRTCDataChannel> create_data_channel(String p_channel_name, Dictionary p_channel_config = Dictionary()) override;