From 075ad10a9ccacf5a4dcaa8cd7fe4fd851767f70f Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Thu, 5 Nov 2015 18:12:15 +0000
Subject: [PATCH] Renames SimulcastLayer to SimulcastStream.

---
 .../extensions/colibri/ColibriConferenceIQ.java      | 12 ++++++------
 .../jabber/extensions/colibri/ColibriIQProvider.java | 10 +++++-----
 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 52368bf2a..34a46f613 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 static class Channel
          * 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 Collection<RTPHdrExtPacketExtension> getRtpHeaderExtensions()
          * 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 void setSimulcastMode(SimulcastMode simulcastMode)
          * 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 39e299ff9..bb579a489 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 @@ else if (ColibriConferenceIQ.GracefulShutdown.ELEMENT_NAME
                                     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