summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordknn <yoann.blein@free.fr>2012-06-03 13:11:35 (GMT)
committerdknn <yoann.blein@free.fr>2012-09-22 08:53:12 (GMT)
commit931b52184bf37f298f9c967883a3b71c912f834b (patch)
treedf2b6d80fb76d3ccbe1c721d3e574d0f2491c90a /Swiften/Elements
parent174d01d9812694d201f6f3939fc7b8bf4650cfa2 (diff)
downloadswift-contrib-931b52184bf37f298f9c967883a3b71c912f834b.zip
swift-contrib-931b52184bf37f298f9c967883a3b71c912f834b.tar.bz2
Add parsing add related tests for RTP description
Diffstat (limited to 'Swiften/Elements')
-rw-r--r--Swiften/Elements/JingleRTPDescription.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Swiften/Elements/JingleRTPDescription.h b/Swiften/Elements/JingleRTPDescription.h
index 5337aa8..26b5a24 100644
--- a/Swiften/Elements/JingleRTPDescription.h
+++ b/Swiften/Elements/JingleRTPDescription.h
@@ -24,12 +24,12 @@ namespace Swift {
};
public:
- JingleRTPDescription(MediaType mediaType = Unknown, std::string bandwidthType = "",
+ JingleRTPDescription(MediaType media = Unknown, std::string bandwidthType = "",
std::string bandwidthValue = "", boost::uint32_t ssrc = 0) :
- mediaType(mediaType), bandwidthType(bandwidthType), bandwidthValue(bandwidthValue), ssrc(ssrc) {}
+ media(media), bandwidthType(bandwidthType), bandwidthValue(bandwidthValue), ssrc(ssrc) {}
- void setMediaType(MediaType mediaType) { this->mediaType = mediaType; }
- MediaType getMediaType() const { return mediaType; }
+ void setMedia(MediaType media) { this->media = media; }
+ MediaType getMedia() const { return media; }
void setBandwidth(const std::string& type, const std::string& value) {
bandwidthType = type;
@@ -47,7 +47,7 @@ namespace Swift {
const std::vector<RTPPayloadType>& getPayloadTypes() const { return payloadTypes; }
private:
- MediaType mediaType;
+ MediaType media;
std::string bandwidthType;
std::string bandwidthValue;
boost::uint32_t ssrc;