equal
deleted
inserted
replaced
1572 { |
1572 { |
1573 // Hold state is connected but sink is disabled -> try enable after a while |
1573 // Hold state is connected but sink is disabled -> try enable after a while |
1574 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - Resume ICMP, Sink" ) |
1574 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - Resume ICMP, Sink" ) |
1575 TRAP_IGNORE( StartTimerL( KSVPSinkResumeICMPErrorTime, KSVPSinkResumeICMPErrorTimerExpired ) ) |
1575 TRAP_IGNORE( StartTimerL( KSVPSinkResumeICMPErrorTime, KSVPSinkResumeICMPErrorTimerExpired ) ) |
1576 } |
1576 } |
|
1577 |
|
1578 else if ( !HasHoldController() && !aSink.IsEnabled() && CMceSession::EEstablished == sessionState && |
|
1579 CMceMediaStream::EDisabled == aStream.State() ) |
|
1580 { |
|
1581 // Not a hold case, mediaStream and sink is disabled -> try enable after a while |
|
1582 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - ICMP, Sink and MediaStream" ) |
|
1583 if ( !IsSessionMuted() ) |
|
1584 { |
|
1585 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - ICMP, Sink not enabled -> enable" ) |
|
1586 aSink.EnableL(); |
|
1587 } |
|
1588 } |
1577 } |
1589 } |
1578 |
1590 |
1579 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange(aStream,aSink) Out" ) |
1591 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange(aStream,aSink) Out" ) |
1580 } |
1592 } |
1581 |
1593 |
1613 !aSource.IsEnabled() && CMceSession::EEstablished == sessionState ) |
1625 !aSource.IsEnabled() && CMceSession::EEstablished == sessionState ) |
1614 { |
1626 { |
1615 // Hold state is connected but source is disabled -> try enable after a while |
1627 // Hold state is connected but source is disabled -> try enable after a while |
1616 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - Resume ICMP, Source" ) |
1628 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - Resume ICMP, Source" ) |
1617 TRAP_IGNORE( StartTimerL( KSVPSourceResumeICMPErrorTime, KSVPSourceResumeICMPErrorTimerExpired ) ) |
1629 TRAP_IGNORE( StartTimerL( KSVPSourceResumeICMPErrorTime, KSVPSourceResumeICMPErrorTimerExpired ) ) |
|
1630 } |
|
1631 |
|
1632 else if ( !HasHoldController() && !aSource.IsEnabled() && CMceSession::EEstablished == sessionState && |
|
1633 CMceMediaStream::EDisabled == aStream.State() ) |
|
1634 { |
|
1635 // Not a hold case, mediaStream and source is disabled -> try enable after a while |
|
1636 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - ICMP, Source and MediaStream" ) |
|
1637 if ( !IsSessionMuted() ) |
|
1638 { |
|
1639 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange - ICMP, Source not enabled -> enable" ) |
|
1640 aSource.EnableL(); |
|
1641 } |
1618 } |
1642 } |
1619 } |
1643 } |
1620 |
1644 |
1621 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange(aStream,aSource) Out" ) |
1645 SVPDEBUG1( "CSVPSessionBase::HandleStreamStateChange(aStream,aSource) Out" ) |
1622 } |
1646 } |