2
0
Эх сурвалжийг харах

Removed Candidate::candidate() method

Paul-Louis Ageneau 6 жил өмнө
parent
commit
3c8d295561

+ 1 - 1
README.md

@@ -38,7 +38,7 @@ pc->onLocalDescription([](const rtc::Description &sdp) {
 
 pc->onLocalCandidate([](const optional<rtc::Candidate> &candidate) {
     if (candidate) {
-        MY_SEND_CANDIDATE_TO_REMOTE(candidate->candidate(), candidate->mid());
+        MY_SEND_CANDIDATE_TO_REMOTE(string(*candidate), candidate->mid());
     } else {
         // Gathering finished
     }

+ 0 - 2
include/rtc/candidate.hpp

@@ -29,9 +29,7 @@ class Candidate {
 public:
 	Candidate(string candidate, std::optional<string> mid = nullopt);
 
-	string candidate() const;
 	std::optional<string> mid() const;
-
 	operator string() const;
 
 private:

+ 3 - 5
src/candidate.cpp

@@ -92,16 +92,14 @@ Candidate::Candidate(string candidate, std::optional<string> mid) {
 	}
 }
 
-string Candidate::candidate() const {
+std::optional<string> Candidate::mid() const { return mMid; }
+
+Candidate::operator string() const {
 	std::ostringstream line;
 	line << "a=candidate:" << mCandidate;
 	return line.str();
 }
 
-std::optional<string> Candidate::mid() const { return mMid; }
-
-Candidate::operator string() const { return candidate(); }
-
 } // namespace rtc
 
 std::ostream &operator<<(std::ostream &out, const rtc::Candidate &candidate) {

+ 1 - 1
src/rtc.cpp

@@ -103,7 +103,7 @@ void rtcSetLocalCandidateCallback(int pc,
 			    userPointer = jt->second;
 		    if (candidate) {
 			    auto mid = candidate->mid() ? *candidate->mid() : string();
-			    candidateCallback(candidate->candidate().c_str(), mid.c_str(), userPointer);
+			    candidateCallback(string(*candidate).c_str(), mid.c_str(), userPointer);
 		    } else {
 			    candidateCallback(nullptr, nullptr, userPointer);
 		    }