aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Politis <gp@jitsi.org>2015-11-05 18:12:15 +0000
committerGeorge Politis <gp@jitsi.org>2015-11-05 18:12:15 +0000
commit075ad10a9ccacf5a4dcaa8cd7fe4fd851767f70f (patch)
tree7d184b9485b513177316db25b40e2279b077e8ba
parent6b2be3be614874af89f91ec2dc02a1dc4e335aa9 (diff)
downloadjitsi-075ad10a9ccacf5a4dcaa8cd7fe4fd851767f70f.zip
jitsi-075ad10a9ccacf5a4dcaa8cd7fe4fd851767f70f.tar.gz
jitsi-075ad10a9ccacf5a4dcaa8cd7fe4fd851767f70f.tar.bz2
Renames SimulcastLayer to SimulcastStream.
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java12
-rw-r--r--src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java10
2 files changed, 11 insertions, 11 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java
index 52368bf..34a46f6 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriConferenceIQ.java
@@ -631,7 +631,7 @@ public class ColibriConferenceIQ
* Videobridge to the endpoint associated with this video
* <tt>Channel</tt>.
*/
- private Integer receivingSimulcastLayer;
+ private Integer receivingSimulcastStream;
/**
* The RTCP port of the <tt>channel</tt> represented by this instance.
@@ -929,9 +929,9 @@ public class ColibriConferenceIQ
* from Jitsi Videobridge to the endpoint associated with this video
* <tt>Channel</tt>.
*/
- public Integer getReceivingSimulcastLayer()
+ public Integer getReceivingSimulcastStream()
{
- return receivingSimulcastLayer;
+ return receivingSimulcastStream;
}
/**
@@ -1327,13 +1327,13 @@ public class ColibriConferenceIQ
* Jitsi Videobridge to the endpoint associated with this video
* <tt>Channel</tt>.
*
- * @param simulcastLayer the target quality of the simulcast substreams
+ * @param simulcastStream the target quality of the simulcast substreams
* to be sent from Jitsi Videobridge to the endpoint associated with
* this video <tt>Channel</tt>.
*/
- public void setReceivingSimulcastLayer(Integer simulcastLayer)
+ public void setReceivingSimulcastStream(Integer simulcastStream)
{
- this.receivingSimulcastLayer = simulcastLayer;
+ this.receivingSimulcastStream = simulcastStream;
}
/**
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java
index 39e299f..bb579a4 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/extensions/colibri/ColibriIQProvider.java
@@ -476,16 +476,16 @@ public class ColibriIQProvider
SimulcastMode.fromString(simulcastMode));
// receiving simulcast layer
- String receivingSimulcastLayer
+ String receivingSimulcastStream
= parser.getAttributeValue(
"",
ColibriConferenceIQ.Channel
.RECEIVING_SIMULCAST_LAYER);
- if ((receivingSimulcastLayer != null)
- && (receivingSimulcastLayer.length() != 0))
- channel.setReceivingSimulcastLayer(
- Integer.parseInt(receivingSimulcastLayer));
+ if ((receivingSimulcastStream != null)
+ && (receivingSimulcastStream.length() != 0))
+ channel.setReceivingSimulcastStream(
+ Integer.parseInt(receivingSimulcastStream));
// rtcpPort
String rtcpPort