diff options
| author | George Politis <gp@jitsi.org> | 2015-11-05 22:53:43 +0000 |
|---|---|---|
| committer | George Politis <gp@jitsi.org> | 2015-11-05 22:53:43 +0000 |
| commit | 6d0a49965098e6cb67b4751d5079cbc22003f27a (patch) | |
| tree | b23e1430aded2122f2ea14314a21b47553f6f668 /src | |
| parent | 2c307e06919ba28326ee68742eb2d5c399d27bcb (diff) | |
| download | jitsi-6d0a49965098e6cb67b4751d5079cbc22003f27a.zip jitsi-6d0a49965098e6cb67b4751d5079cbc22003f27a.tar.gz jitsi-6d0a49965098e6cb67b4751d5079cbc22003f27a.tar.bz2 | |
Revert "Renames SimulcastLayer to SimulcastStream."
This reverts commit 075ad10a9ccacf5a4dcaa8cd7fe4fd851767f70f.
Diffstat (limited to 'src')
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 34a46f6..52368bf 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 receivingSimulcastStream; + private Integer receivingSimulcastLayer; /** * 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 getReceivingSimulcastStream() + public Integer getReceivingSimulcastLayer() { - return receivingSimulcastStream; + return receivingSimulcastLayer; } /** @@ -1327,13 +1327,13 @@ public class ColibriConferenceIQ * Jitsi Videobridge to the endpoint associated with this video * <tt>Channel</tt>. * - * @param simulcastStream the target quality of the simulcast substreams + * @param simulcastLayer 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 setReceivingSimulcastStream(Integer simulcastStream) + public void setReceivingSimulcastLayer(Integer simulcastLayer) { - this.receivingSimulcastStream = simulcastStream; + this.receivingSimulcastLayer = simulcastLayer; } /** 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 bb579a4..39e299f 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 receivingSimulcastStream + String receivingSimulcastLayer = parser.getAttributeValue( "", ColibriConferenceIQ.Channel .RECEIVING_SIMULCAST_LAYER); - if ((receivingSimulcastStream != null) - && (receivingSimulcastStream.length() != 0)) - channel.setReceivingSimulcastStream( - Integer.parseInt(receivingSimulcastStream)); + if ((receivingSimulcastLayer != null) + && (receivingSimulcastLayer.length() != 0)) + channel.setReceivingSimulcastLayer( + Integer.parseInt(receivingSimulcastLayer)); // rtcpPort String rtcpPort |