vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 00:59:39 +02:00
Code Issues Releases Wiki Activity

Merge branch '4.2'

Browse source
This commit is contained in:
Florian Schmaus 2017-12-25 11:40:45 +01:00
commit 0eeab74990
55 changed files with 385 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

34
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java
View file

@ -88,6 +88,16 @@ public class AudioMediaSession extends JingleMediaSession {
audioChannel = new AudioChannel(new MediaLocator(this.getMediaLocator()), localIp, ip, localPort, remotePort, AudioFormatUtils.getAudioFormat(this.getPayloadType()),this);
}
/**
* Starts transmission and for NAT Traversal reasons start receiving also.
*
* @deprecated use {@link #startTransmit()} instead.
*/
@Deprecated
public void startTrasmit() {
startTransmit();
}
/**
* Starts transmission and for NAT Traversal reasons start receiving also.
*/
@ -97,7 +107,19 @@ public class AudioMediaSession extends JingleMediaSession {
}
/**
* Set transmit activity. If the active is true, the instance should trasmit.
* Set transmit activity. If the active is true, the instance should transmit.
* If it is set to false, the instance should pause transmit.
*
* @param active active state
* @deprecated use {@link #setTransmit(boolean)} instead.
*/
@Deprecated
public void setTrasmit(boolean active) {
setTransmit(active);
}
/**
* Set transmit activity. If the active is true, the instance should transmit.
* If it is set to false, the instance should pause transmit.
*
* @param active active state
@ -115,6 +137,16 @@ public class AudioMediaSession extends JingleMediaSession {
// Do nothing
}
/**
* Stops transmission and for NAT Traversal reasons stop receiving also.
*
* @deprecated use {@link #stopTransmit()} instead.
*/
@Deprecated
public void stopTrasmit() {
stopTransmit();
}
/**
* Stops transmission and for NAT Traversal reasons stop receiving also.
*/

32
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java
View file

@ -153,6 +153,16 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
}
}
/**
* Starts transmission and for NAT Traversal reasons start receiving also.
*
* @deprecated use {@link #startTransmit()} instead.
*/
@Deprecated
public void startTrasmit() {
startTransmit();
}
/**
* Starts transmission and for NAT Traversal reasons start receiving also.
*/
@ -168,6 +178,18 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
}
}
/**
* Set transmit activity. If the active is true, the instance should transmit.
* If it is set to false, the instance should pause transmit.
*
* @param active active state
* @deprecated use {@link #setTransmit(boolean)} instead.
*/
@Deprecated
public void setTrasmit(boolean active) {
setTransmit(active);
}
/**
* Set transmit activity. If the active is true, the instance should transmit.
* If it is set to false, the instance should pause transmit.
@ -187,6 +209,16 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio
// Do nothing
}
/**
* Stops transmission and for NAT Traversal reasons stop receiving also.
*
* @deprecated use {@link #stopTransmit()} instead.
*/
@Deprecated
public void stopTrasmit() {
stopTransmit();
}
/**
* Stops transmission and for NAT Traversal reasons stop receiving also.
*/

32
smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java
View file

@ -119,6 +119,16 @@ public class ScreenShareSession extends JingleMediaSession {
}
}
/**
* Starts transmission and for NAT Traversal reasons start receiving also.
*
* @deprecated use {@link #startTransmit()} instead.
*/
@Deprecated
public void startTrasmit() {
startTransmit();
}
/**
* Starts transmission and for NAT Traversal reasons start receiving also.
*/
@ -127,6 +137,18 @@ public class ScreenShareSession extends JingleMediaSession {
new Thread(transmitter).start();
}
/**
* Set transmit activity. If the active is true, the instance should transmit.
* If it is set to false, the instance should pause transmit.
*
* @param active active state
* @deprecated use {@link #setTransmit(boolean)} instead.
*/
@Deprecated
public void setTrasmit(boolean active) {
setTransmit(active);
}
/**
* Set transmit activity. If the active is true, the instance should transmit.
* If it is set to false, the instance should pause transmit.
@ -146,6 +168,16 @@ public class ScreenShareSession extends JingleMediaSession {
// Do nothing
}
/**
* Stops transmission and for NAT Traversal reasons stop receiving also.
*
* @deprecated use {@link #stopTransmit()} instead.
*/
@Deprecated
public void stopTrasmit() {
stopTransmit();
}
/**
* Stops transmission and for NAT Traversal reasons stop receiving also.
*/