関数名を変更する

shiguredo · Sep 5, 2023 · a8f569b · a8f569b
1 parent c5095ba
commit a8f569b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -11,13 +11,11 @@
 
 ## develop
 
-- [CHANGE] `SoraSignaling::GetConnectedSignalingURL()` を `SoraSignaling::GetConnectedURL()` にリネーム
-    - @melpon
 - [UPDATE] WebRTC を m116.5845.6.1 に上げる
     - @torikizi
 - [UPDATE] m116 で `cricket::Codec` は protected になったため `cricket::CreateVideoCodec` を利用するように修正
     - @torikizi
-- [ADD] `SoraSignaling::GetContactURL()` 関数を追加
+- [ADD] `SoraSignaling::GetSelectedSignalingURL()` 関数を追加
     - @melpon
 
 ## 2023.10.0 (2023-08-26)

diff --git a/include/sora/sora_signaling.h b/include/sora/sora_signaling.h
@@ -154,8 +154,8 @@ class SoraSignaling : public std::enable_shared_from_this<SoraSignaling>,
   bool SendDataChannel(const std::string& label, const std::string& data);
 
   std::string GetConnectionID() const;
-  std::string GetConnectedURL() const;
-  std::string GetContactURL() const;
+  std::string GetSelectedSignalingURL() const;
+  std::string GetConnectedSignalingURL() const;
   bool IsConnectedDataChannel() const;
   bool IsConnectedWebsocket() const;
 
@@ -266,8 +266,8 @@ class SoraSignaling : public std::enable_shared_from_this<SoraSignaling>,
     std::string s;
     mutable std::mutex m;
   };
-  atomic_string connected_url_;
-  atomic_string contact_url_;
+  atomic_string selected_signaling_url_;
+  atomic_string connected_signaling_url_;
   std::shared_ptr<Websocket> ws_;
   std::shared_ptr<DataChannel> dc_;
   bool using_datachannel_ = false;

diff --git a/src/sora_signaling.cpp b/src/sora_signaling.cpp
@@ -53,11 +53,11 @@ std::string SoraSignaling::GetAudioMid() const {
 std::string SoraSignaling::GetConnectionID() const {
   return connection_id_;
 }
-std::string SoraSignaling::GetConnectedURL() const {
-  return connected_url_.load();
+std::string SoraSignaling::GetSelectedSignalingURL() const {
+  return selected_signaling_url_.load();
 }
-std::string SoraSignaling::GetContactURL() const {
-  return contact_url_.load();
+std::string SoraSignaling::GetConnectedSignalingURL() const {
+  return connected_signaling_url_.load();
 }
 bool SoraSignaling::IsConnectedDataChannel() const {
   return dc_ && using_datachannel_;
@@ -275,7 +275,7 @@ void SoraSignaling::OnRedirect(boost::system::error_code ec,
   state_ = State::Connected;
   ws_ = ws;
   ws_connected_ = true;
-  connected_url_.store(url);
+  connected_signaling_url_.store(url);
   RTC_LOG(LS_INFO) << "Redirected: url=" << url;
 
   DoRead();
@@ -826,8 +826,8 @@ void SoraSignaling::OnConnect(boost::system::error_code ec,
   state_ = State::Connected;
   ws_ = ws;
   ws_connected_ = true;
-  contact_url_.store(url);
-  connected_url_.store(url);
+  selected_signaling_url_.store(url);
+  connected_signaling_url_.store(url);
   RTC_LOG(LS_INFO) << "Connected: url=" << url;
 
   DoRead();
@@ -1403,8 +1403,8 @@ void SoraSignaling::Clear() {
   connection_timeout_timer_.cancel(tec);
   closing_timeout_timer_.cancel(tec);
   connecting_wss_.clear();
-  connected_url_.store("");
-  contact_url_.store("");
+  selected_signaling_url_.store("");
+  connected_signaling_url_.store("");
   pc_ = nullptr;
   ws_connected_ = false;
   ws_ = nullptr;