Browse Source

Renamed Direction enums to be inline with other enums

Staz M 5 years ago
parent
commit
22ffaacc5c
3 changed files with 13 additions and 13 deletions
  1. 1 1
      examples/media/main.cpp
  2. 5 5
      include/rtc/description.hpp
  3. 7 7
      src/description.cpp

+ 1 - 1
examples/media/main.cpp

@@ -50,7 +50,7 @@ int main() {
     });
     });
 
 
     rtc::Description offer;
     rtc::Description offer;
-    rtc::Description::Media &m = offer.addVideoMedia(rtc::Description::RECV_ONLY);
+    rtc::Description::Media &m = offer.addVideoMedia(rtc::Description::RecvOnly);
     m.addH264Codec(96);
     m.addH264Codec(96);
     pc->setLocalDescription(offer);
     pc->setLocalDescription(offer);
     auto dc = pc->createDataChannel("test");
     auto dc = pc->createDataChannel("test");

+ 5 - 5
include/rtc/description.hpp

@@ -36,10 +36,10 @@ public:
     enum class Type { Unspec = 0, Offer = 1, Answer = 2 };
     enum class Type { Unspec = 0, Offer = 1, Answer = 2 };
 	enum class Role { ActPass = 0, Passive = 1, Active = 2 };
 	enum class Role { ActPass = 0, Passive = 1, Active = 2 };
     enum Direction {
     enum Direction {
-        SEND_ONLY,
-        RECV_ONLY,
-        BOTH,
-        UNKNOWN
+        SendOnly,
+        RecvOnly,
+        SendRecv,
+        Unknown
     };
     };
 
 
     Description(const string &sdp, const string &typeString = "");
     Description(const string &sdp, const string &typeString = "");
@@ -126,7 +126,7 @@ public:
 
 
     Media & addAudioMedia();
     Media & addAudioMedia();
 
 
-    Media &addVideoMedia(Direction direction=Direction::RECV_ONLY);
+    Media &addVideoMedia(Direction direction=Direction::RecvOnly);
 
 
 private:
 private:
 	Type mType;
 	Type mType;

+ 7 - 7
src/description.cpp

@@ -456,13 +456,13 @@ void Description::Media::addVP9Codec(int payloadType) {
 Description::Direction Description::Media::getDirection() {
 Description::Direction Description::Media::getDirection() {
     for (auto attr : attributes) {
     for (auto attr : attributes) {
         if (attr == "sendrecv")
         if (attr == "sendrecv")
-            return Direction::BOTH;
+            return Direction::SendRecv;
         if (attr == "recvonly")
         if (attr == "recvonly")
-            return Direction::RECV_ONLY;
+            return Direction::RecvOnly;
         if (attr == "sendonly")
         if (attr == "sendonly")
-            return Direction::SEND_ONLY;
+            return Direction::SendOnly;
     }
     }
-    return Direction::UNKNOWN;
+    return Direction::Unknown;
 }
 }
 
 
 void Description::Media::setDirection(Description::Direction dir) {
 void Description::Media::setDirection(Description::Direction dir) {
@@ -473,11 +473,11 @@ void Description::Media::setDirection(Description::Direction dir) {
         else
         else
             it++;
             it++;
     }
     }
-    if (dir == Direction::BOTH)
+    if (dir == Direction::SendRecv)
         attributes.emplace(attributes.begin(), "sendrecv");
         attributes.emplace(attributes.begin(), "sendrecv");
-    else if (dir == Direction::RECV_ONLY)
+    else if (dir == Direction::RecvOnly)
         attributes.emplace(attributes.begin(), "recvonly");
         attributes.emplace(attributes.begin(), "recvonly");
-    if (dir == Direction::SEND_ONLY)
+    if (dir == Direction::SendOnly)
         attributes.emplace(attributes.begin(), "sendonly");
         attributes.emplace(attributes.begin(), "sendonly");
 }
 }