Browse Source

Cleaned up deprecated methods

Paul-Louis Ageneau 2 years ago
parent
commit
19789190d7
3 changed files with 0 additions and 68 deletions
  1. 0 27
      include/rtc/description.hpp
  2. 0 6
      include/rtc/global.hpp
  3. 0 35
      src/description.cpp

+ 0 - 27
include/rtc/description.hpp

@@ -127,16 +127,6 @@ public:
 
 		virtual void parseSdpLine(string_view line);
 
-		// For backward compatibility, do not use
-		[[deprecated]] std::vector<string>::iterator beginAttributes();
-		[[deprecated]] std::vector<string>::iterator endAttributes();
-		[[deprecated]] std::vector<string>::iterator
-		removeAttribute(std::vector<string>::iterator iterator);
-		[[deprecated]] std::map<int, ExtMap>::iterator beginExtMaps();
-		[[deprecated]] std::map<int, ExtMap>::iterator endExtMaps();
-		[[deprecated]] std::map<int, ExtMap>::iterator
-		removeExtMap(std::map<int, ExtMap>::iterator iterator);
-
 	protected:
 		Entry(const string &mline, string mid, Direction dir = Direction::Unknown);
 		virtual string generateSdpLines(string_view eol) const;
@@ -219,11 +209,6 @@ public:
 
 			std::vector<string> rtcpFbs;
 			std::vector<string> fmtps;
-
-			// For backward compatibility, do not use
-			[[deprecated]] void addFB(string fb) { addFeedback(std::move(fb)); }
-			[[deprecated]] void removeFB(const string &str) { removeFeedback(str); }
-			[[deprecated]] void addAttribute(string attr) { addParameter(std::move(attr)); }
 		};
 
 		bool hasPayloadType(int payloadType) const;
@@ -237,18 +222,6 @@ public:
 
 		virtual void parseSdpLine(string_view line) override;
 
-		// For backward compatibility, do not use
-		using RTPMap = RtpMap;
-		[[deprecated]] int getBitrate() const { return bitrate(); }
-		[[deprecated]] inline void addRTPMap(RtpMap map) { addRtpMap(std::move(map)); }
-		[[deprecated]] inline void addRTXCodec(int pt, int origpt, unsigned int clk) {
-			addRtxCodec(pt, origpt, clk);
-		}
-		[[deprecated]] std::map<int, RtpMap>::iterator beginMaps();
-		[[deprecated]] std::map<int, RtpMap>::iterator endMaps();
-		[[deprecated]] std::map<int, RtpMap>::iterator
-		removeMap(std::map<int, RtpMap>::iterator iterator);
-
 	private:
 		virtual string generateSdpLines(string_view eol) const override;
 

+ 0 - 6
include/rtc/global.hpp

@@ -41,12 +41,6 @@ typedef std::function<void(LogLevel level, string message)> LogCallback;
 
 RTC_CPP_EXPORT void InitLogger(LogLevel level, LogCallback callback = nullptr);
 
-#ifdef PLOG_DEFAULT_INSTANCE_ID
-// Deprecated, kept for retro-compatibility
-[[deprecated]]
-RTC_CPP_EXPORT void InitLogger(plog::Severity severity, plog::IAppender *appender = nullptr);
-#endif
-
 RTC_CPP_EXPORT void Preload();
 RTC_CPP_EXPORT std::shared_future<void> Cleanup();
 

+ 0 - 35
src/description.cpp

@@ -650,28 +650,6 @@ void Description::Entry::parseSdpLine(string_view line) {
 	}
 }
 
-std::vector<string>::iterator Description::Entry::beginAttributes() { return mAttributes.begin(); }
-
-std::vector<string>::iterator Description::Entry::endAttributes() { return mAttributes.end(); }
-
-std::vector<string>::iterator
-Description::Entry::removeAttribute(std::vector<string>::iterator it) {
-	return mAttributes.erase(it);
-}
-
-std::map<int, Description::Entry::ExtMap>::iterator Description::Entry::beginExtMaps() {
-	return mExtMaps.begin();
-}
-
-std::map<int, Description::Entry::ExtMap>::iterator Description::Entry::endExtMaps() {
-	return mExtMaps.end();
-}
-
-std::map<int, Description::Entry::ExtMap>::iterator
-Description::Entry::removeExtMap(std::map<int, Description::Entry::ExtMap>::iterator iterator) {
-	return mExtMaps.erase(iterator);
-}
-
 int Description::Entry::ExtMap::parseId(string_view description) {
 	size_t p = description.find(' ');
 	return to_integer<int>(description.substr(0, p));
@@ -1039,19 +1017,6 @@ void Description::Media::parseSdpLine(string_view line) {
 	}
 }
 
-std::map<int, Description::Media::RtpMap>::iterator Description::Media::beginMaps() {
-	return mRtpMaps.begin();
-}
-
-std::map<int, Description::Media::RtpMap>::iterator Description::Media::endMaps() {
-	return mRtpMaps.end();
-}
-
-std::map<int, Description::Media::RtpMap>::iterator
-Description::Media::removeMap(std::map<int, Description::Media::RtpMap>::iterator iterator) {
-	return mRtpMaps.erase(iterator);
-}
-
 Description::Media::RtpMap::RtpMap(int payloadType) {
 	this->payloadType = payloadType;
 	this->clockRate = 0;