From d06e536d12bd6eff02de4fdfbba86f25d1c048fc Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Fri, 9 Jul 2021 18:39:30 +0200 Subject: Add copyright headers --- src/WebRTCLibPeerConnection.hpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'src/WebRTCLibPeerConnection.hpp') diff --git a/src/WebRTCLibPeerConnection.hpp b/src/WebRTCLibPeerConnection.hpp index 85ef33f..6902518 100644 --- a/src/WebRTCLibPeerConnection.hpp +++ b/src/WebRTCLibPeerConnection.hpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* WebRTCLibPeerConnection.hpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2021 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2021 Godot Engine contributors (cf. AUTHORS.md). */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ + #ifndef WEBRTC_PEER_H #define WEBRTC_PEER_H -- cgit v1.2.3 From 69f92fa26c7bef3b042d8da5e520fe60b22e01b7 Mon Sep 17 00:00:00 2001 From: Fabio Alessandrelli Date: Fri, 9 Jul 2021 18:42:30 +0200 Subject: Run clang-format on src/* --- src/WebRTCLibDataChannel.cpp | 6 +++--- src/WebRTCLibDataChannel.hpp | 2 +- src/WebRTCLibPeerConnection.cpp | 13 +++++++++---- src/WebRTCLibPeerConnection.hpp | 2 ++ src/init.cpp | 5 ++--- 5 files changed, 17 insertions(+), 11 deletions(-) (limited to 'src/WebRTCLibPeerConnection.hpp') diff --git a/src/WebRTCLibDataChannel.cpp b/src/WebRTCLibDataChannel.cpp index 7cbf3b7..f29d562 100644 --- a/src/WebRTCLibDataChannel.cpp +++ b/src/WebRTCLibDataChannel.cpp @@ -70,7 +70,6 @@ WebRTCLibDataChannel *WebRTCLibDataChannel::new_data_channel(rtc::scoped_refptr< return tmp; } - void WebRTCLibDataChannel::bind_channel(rtc::scoped_refptr p_channel) { ERR_FAIL_COND(p_channel.get() == nullptr); @@ -150,7 +149,7 @@ godot_error WebRTCLibDataChannel::poll() { } void WebRTCLibDataChannel::close() { - if(channel.get() != nullptr) { + if (channel.get() != nullptr) { channel->Close(); channel->UnregisterObserver(); } @@ -197,7 +196,8 @@ void WebRTCLibDataChannel::_init() { register_interface(&interface); } -WebRTCLibDataChannel::WebRTCLibDataChannel() : observer(this) { +WebRTCLibDataChannel::WebRTCLibDataChannel() : + observer(this) { mutex = new std::mutex; } diff --git a/src/WebRTCLibDataChannel.hpp b/src/WebRTCLibDataChannel.hpp index d02e848..1d1ce0f 100644 --- a/src/WebRTCLibDataChannel.hpp +++ b/src/WebRTCLibDataChannel.hpp @@ -36,8 +36,8 @@ #include "api/peer_connection_interface.h" // interface for all things needed from WebRTC #include "media/base/media_engine.h" // needed for CreateModularPeerConnectionFactory -#include "net/WebRTCDataChannelNative.hpp" #include "PoolArrays.hpp" +#include "net/WebRTCDataChannelNative.hpp" #include namespace godot_webrtc { diff --git a/src/WebRTCLibPeerConnection.cpp b/src/WebRTCLibPeerConnection.cpp index 348cdcb..d090654 100644 --- a/src/WebRTCLibPeerConnection.cpp +++ b/src/WebRTCLibPeerConnection.cpp @@ -28,9 +28,9 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "WebRTCLibPeerConnection.hpp" #include "WebRTCDataChannel.hpp" #include "WebRTCDataChannelGDNative.hpp" -#include "WebRTCLibPeerConnection.hpp" #include "WebRTCLibDataChannel.hpp" using namespace godot_webrtc; @@ -114,7 +114,12 @@ godot_error _parse_ice_server(webrtc::PeerConnectionInterface::RTCConfiguration godot_error _parse_channel_config(webrtc::DataChannelInit &r_config, godot::Dictionary p_dict) { godot::Variant v; -#define _SET_N(PROP, PNAME, TYPE) if (p_dict.has(#PROP)) { v = p_dict[#PROP]; if(v.get_type() == godot::Variant::TYPE) r_config.PNAME = v; } +#define _SET_N(PROP, PNAME, TYPE) \ + if (p_dict.has(#PROP)) { \ + v = p_dict[#PROP]; \ + if (v.get_type() == godot::Variant::TYPE) \ + r_config.PNAME = v; \ + } #define _SET(PROP, TYPE) _SET_N(PROP, PROP, TYPE) _SET(negotiated, BOOL); _SET(id, INT); @@ -137,7 +142,7 @@ WebRTCLibPeerConnection::ConnectionState WebRTCLibPeerConnection::get_connection ERR_FAIL_COND_V(peer_connection.get() == nullptr, STATE_CLOSED); webrtc::PeerConnectionInterface::IceConnectionState state = peer_connection->ice_connection_state(); - switch(state) { + switch (state) { case webrtc::PeerConnectionInterface::kIceConnectionNew: return STATE_NEW; case webrtc::PeerConnectionInterface::kIceConnectionChecking: @@ -248,7 +253,7 @@ void WebRTCLibPeerConnection::close() { peer_connection->Close(); } peer_connection = nullptr; - while(!signal_queue.empty()) { + while (!signal_queue.empty()) { signal_queue.pop(); } } diff --git a/src/WebRTCLibPeerConnection.hpp b/src/WebRTCLibPeerConnection.hpp index 6902518..a265bc1 100644 --- a/src/WebRTCLibPeerConnection.hpp +++ b/src/WebRTCLibPeerConnection.hpp @@ -48,6 +48,7 @@ private: godot_error _create_pc(webrtc::PeerConnectionInterface::RTCConfiguration &config); static std::unique_ptr signaling_thread; + public: static void _register_methods(); static void initialize_signaling(); @@ -127,6 +128,7 @@ private: godot::String method; godot::Variant argv[3]; int argc = 0; + public: Signal(godot::String p_method, int p_argc, const godot::Variant *p_argv) { method = p_method; diff --git a/src/init.cpp b/src/init.cpp index f37bc5a..a6066c3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -64,14 +64,14 @@ godot_error create_peer_connection_wp(godot_object *out) { _singleton_api->godot_string_destroy(&s); // Bind script to Object - const void *args3[] = { (void *)script }; + const void *args3[] = { (void *)script }; _singleton_api->godot_method_bind_ptrcall(_set_script_mb, out, args3, nullptr); return GODOT_OK; } godot_net_webrtc_library library = { - {3, 2}, + { 3, 2 }, &unregistered, &create_peer_connection_wp, NULL, @@ -102,7 +102,6 @@ extern "C" void GDN_EXPORT godot_gdnative_singleton() { extern "C" void GDN_EXPORT godot_gdnative_init(godot_gdnative_init_options *o) { const godot_gdnative_core_api_struct *api = o->api_struct; for (int i = 0; i < api->num_extensions; i++) { - if (api->extensions[i]->type != GDNATIVE_EXT_NET) continue; -- cgit v1.2.3