equal
deleted
inserted
replaced
1537 newMaster->iContext = oldMaster->iRequestedContext ? |
1537 newMaster->iContext = oldMaster->iRequestedContext ? |
1538 oldMaster->iRequestedContext : |
1538 oldMaster->iRequestedContext : |
1539 newMaster->iContext; |
1539 newMaster->iContext; |
1540 newMaster->iRequestedContext = NULL; |
1540 newMaster->iRequestedContext = NULL; |
1541 oldMaster->iRequestedContext = NULL; |
1541 oldMaster->iRequestedContext = NULL; |
1542 |
1542 if( aForkedSession ) |
|
1543 { |
1543 newMaster->MediaSession()->Merge( *oldMaster->MediaSession(), |
1544 newMaster->MediaSession()->Merge( *oldMaster->MediaSession(), |
1544 KMceDeepMergeYes ); |
1545 KMceDeepMergeYes ); |
|
1546 } |
1545 |
1547 |
1546 MCEMM_DEBUG("context switch performed") |
1548 MCEMM_DEBUG("context switch performed") |
1547 } |
1549 } |
1548 else |
1550 else |
1549 { |
1551 { |
1720 iCurrentIndex = currentIndex; |
1722 iCurrentIndex = currentIndex; |
1721 } |
1723 } |
1722 |
1724 |
1723 return count; |
1725 return count; |
1724 } |
1726 } |
|
1727 void CMceSdpSession::UpdateSecureStreamL( CMceComSession& aSession ) |
|
1728 { |
|
1729 MCEMM_DEBUG("CMceSdpSession::UpdateSecureStream() : Entry ") |
|
1730 RPointerArray< CSdpMediaField >& mediaLines = iSdpRemoteMediaFields; |
|
1731 RPointerArray <CMceComMediaStream>& streams = aSession.Streams(); |
|
1732 CSdpMediaField* mediaLine = NULL; |
|
1733 CMceComMediaStream* aStream = NULL; |
|
1734 for ( TInt index = 0; index < mediaLines.Count(); index++ ) |
|
1735 { |
|
1736 mediaLine = mediaLines[ index ]; |
|
1737 aStream = MediaSlotInUse( index, streams ); |
|
1738 if( aSession.SecureSession() && aStream ) |
|
1739 { |
|
1740 aStream = aStream->OfferStream(); |
|
1741 aSession.SecureSession()->ForceUpdateSecureStreamL(*aStream, *mediaLine ); |
|
1742 } |
|
1743 } |
|
1744 MCEMM_DEBUG("CMceSdpSession::UpdateSecureStream() : Exit ") |
|
1745 } |