瀏覽代碼

Renamed IceConfiguration to Configuration

Paul-Louis Ageneau 6 年之前
父節點
當前提交
d039879b44
共有 8 個文件被更改,包括 13 次插入13 次删除
  1. 1 1
      include/rtc/configuration.hpp
  2. 4 4
      include/rtc/peerconnection.hpp
  3. 1 1
      src/iceconfiguration.cpp
  4. 1 1
      src/icetransport.cpp
  5. 2 2
      src/icetransport.hpp
  6. 2 2
      src/peerconnection.cpp
  7. 1 1
      src/rtc.cpp
  8. 1 1
      test/main.cpp

+ 1 - 1
include/rtc/iceconfiguration.hpp → include/rtc/configuration.hpp

@@ -35,7 +35,7 @@ struct IceServer {
 	string service;
 };
 
-struct IceConfiguration {
+struct Configuration {
 	std::vector<IceServer> servers;
 	uint16_t portRangeBegin = 1024;
 	uint16_t portRangeEnd = 65535;

+ 4 - 4
include/rtc/peerconnection.hpp

@@ -22,7 +22,7 @@
 #include "candidate.hpp"
 #include "datachannel.hpp"
 #include "description.hpp"
-#include "iceconfiguration.hpp"
+#include "configuration.hpp"
 #include "include.hpp"
 #include "message.hpp"
 #include "reliability.hpp"
@@ -40,10 +40,10 @@ class SctpTransport;
 
 class PeerConnection {
 public:
-	PeerConnection(const IceConfiguration &config);
+	PeerConnection(const Configuration &config);
 	~PeerConnection();
 
-	const IceConfiguration *config() const;
+	const Configuration *config() const;
 
 	std::optional<Description> localDescription() const;
 	std::optional<Description> remoteDescription() const;
@@ -71,7 +71,7 @@ private:
 	void processLocalCandidate(std::optional<Candidate> candidate);
 	void triggerDataChannel(std::shared_ptr<DataChannel> dataChannel);
 
-	const IceConfiguration mConfig;
+	const Configuration mConfig;
 	const std::shared_ptr<Certificate> mCertificate;
 
 	std::optional<Description> mLocalDescription;

+ 1 - 1
src/iceconfiguration.cpp

@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "iceconfiguration.hpp"
+#include "configuration.hpp"
 
 namespace rtc {
 

+ 1 - 1
src/icetransport.cpp

@@ -33,7 +33,7 @@ namespace rtc {
 using std::shared_ptr;
 using std::weak_ptr;
 
-IceTransport::IceTransport(const IceConfiguration &config, Description::Role role,
+IceTransport::IceTransport(const Configuration &config, Description::Role role,
                            candidate_callback candidateCallback, ready_callback ready)
     : mRole(role), mState(State::Disconnected), mNiceAgent(nullptr, nullptr),
       mMainLoop(nullptr, nullptr), mCandidateCallback(std::move(candidateCallback)),

+ 2 - 2
src/icetransport.hpp

@@ -21,7 +21,7 @@
 
 #include "candidate.hpp"
 #include "description.hpp"
-#include "iceconfiguration.hpp"
+#include "configuration.hpp"
 #include "include.hpp"
 #include "peerconnection.hpp"
 #include "transport.hpp"
@@ -50,7 +50,7 @@ public:
 	using candidate_callback = std::function<void(const std::optional<Candidate> &candidate)>;
 	using ready_callback = std::function<void(void)>;
 
-	IceTransport(const IceConfiguration &config, Description::Role role,
+	IceTransport(const Configuration &config, Description::Role role,
 	             candidate_callback candidateCallback, ready_callback ready);
 	~IceTransport();
 

+ 2 - 2
src/peerconnection.cpp

@@ -31,12 +31,12 @@ using namespace std::placeholders;
 using std::function;
 using std::shared_ptr;
 
-PeerConnection::PeerConnection(const IceConfiguration &config)
+PeerConnection::PeerConnection(const Configuration &config)
     : mConfig(config), mCertificate(make_certificate("libdatachannel")) {}
 
 PeerConnection::~PeerConnection() {}
 
-const IceConfiguration *PeerConnection::config() const { return &mConfig; }
+const Configuration *PeerConnection::config() const { return &mConfig; }
 
 std::optional<Description> PeerConnection::localDescription() const { return mLocalDescription; }
 

+ 1 - 1
src/rtc.cpp

@@ -37,7 +37,7 @@ int lastId = 0;
 } // namespace
 
 int rtcCreatePeerConnection(const char **iceServers, int iceServersCount) {
-	IceConfiguration config;
+	Configuration config;
 	for (int i = 0; i < iceServersCount; ++i) {
 		config.servers.emplace_back(IceServer(string(iceServers[i])));
 	}

+ 1 - 1
test/main.cpp

@@ -27,7 +27,7 @@ using namespace rtc;
 using namespace std;
 
 int main(int argc, char **argv) {
-	IceConfiguration config;
+	Configuration config;
 
 	auto pc1 = std::make_shared<PeerConnection>(config);
 	auto pc2 = std::make_shared<PeerConnection>(config);