svn commit: r6289 - trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java


#1

Hey Lubomir,

These were very nice catches! Thanks for fixing!

Cheers,
Emil

···

On Tue, Nov 10, 2009 at 6:37 AM, <lubomir_m@dev.java.net> wrote:

Author: lubomir_m
Date: 2009-11-09 21:37:17+0000
New Revision: 6289

Modified:
trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java

Log:
Attempts to fix suspicious recently-committed code related to SIP and neomedia.

Modified: trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java
Url: https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java?view=diff&rev=6289&p1=trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java&p2=trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java&r1=6288&r2=6289

--- trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java (original)
+++ trunk/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandler.java 2009-11-09 21:37:17+0000
@@ -34,6 +34,7 @@
* Our class logger.
*/
private Logger logger = Logger.getLogger(CallPeerMediaHandler.class);
+
/**
* A reference to the CallPeerSipImpl instance that this handler is
* managing media streams for.
@@ -346,7 +347,6 @@
//Audio Media Description
Vector<MediaDescription> mediaDescs = createMediaDescriptions();

-
//wrap everything up in a session description
String userName = peer.getProtocolProvider().getAccountID().getUserID();

@@ -376,7 +376,7 @@
if(locallyOnHold)
audioDirection = audioDirection.and(MediaDirection.SENDONLY);

- if(audioDirection != MediaDirection.INACTIVE);
+ if(audioDirection != MediaDirection.INACTIVE)
{
mediaDescs.add(createMediaDescription(
aDev.getSupportedFormats(),
@@ -395,7 +395,7 @@
if(locallyOnHold)
videoDirection = videoDirection.and(MediaDirection.SENDONLY);

- if(videoDirection != MediaDirection.INACTIVE);
+ if(videoDirection != MediaDirection.INACTIVE)
{
mediaDescs.add(createMediaDescription(
vDev.getSupportedFormats(),
@@ -434,8 +434,6 @@
return newOffer;
}

-
-
private InetAddress getLastUsedLocalHost()
{
if (audioStreamConnector != null)
@@ -704,10 +702,6 @@
{
closeStream(mediaType);
}
-
- //create the corresponding stream
- initStream( connector, dev, supportedFormats.get(0),
- target, direction);
}
}

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

--
Emil Ivov, Ph.D. 67000 Strasbourg,
Project Lead France
SIP Communicator
emcho@sip-communicator.org PHONE: +33.1.77.62.43.30
http://sip-communicator.org FAX: +33.1.77.62.47.31