multimediacommsengine/mmcesrv/mmcemediamanager/src/mcesecuremediasession.cpp
branchRCL_3
changeset 46 4da1f672912e
parent 45 3f7c7e6eea8a
equal deleted inserted replaced
45:3f7c7e6eea8a 46:4da1f672912e
    47                                      CMccSecureInterface& aSecureInterface)
    47                                      CMccSecureInterface& aSecureInterface)
    48     :       iManager( aManager ),
    48     :       iManager( aManager ),
    49             iSession( aSession ),
    49             iSession( aSession ),
    50             iSecureInterface(aSecureInterface),
    50             iSecureInterface(aSecureInterface),
    51             iKeyNeedUpdated( ETrue ),
    51             iKeyNeedUpdated( ETrue ),
    52             iCryptoContextUpdate (EFalse),
    52             iCryptoContextUpdate (EFalse ),
    53             iLSReadyToBind ( ETrue ),
    53             iLSReadyToBind ( EFalse ),
    54             iStringTable( NULL )
    54             iStringTable( NULL )
    55     {
    55     {
    56     
    56     
    57     }
    57     }
    58 
    58 
   449 				if (stream->Data().Id()== secureStream->MediaStream().Id() || 
   449 				if (stream->Data().Id()== secureStream->MediaStream().Id() || 
   450 					 ( stream->Data().BoundStream() && 
   450 					 ( stream->Data().BoundStream() && 
   451 					   stream->Data().iLinkedStream->Id() == secureStream->MediaStream().Id() ) ) 
   451 					   stream->Data().iLinkedStream->Id() == secureStream->MediaStream().Id() ) ) 
   452 					{
   452 					{
   453 					//bind
   453 					//bind
   454 					secureStream->BindCrypto(*stream);
   454 				    if( secureStream->iWaitingBinding )
   455 					
   455 				    	{
       
   456 						secureStream->BindCrypto(*stream);
       
   457 				    	}
   456 					}
   458 					}
   457 				}
   459 				}
   458 			}
   460 			}
   459 		}
   461 		}
   460 	MCEMM_DEBUG("CMceSecureDesStream::BindStreamCrypto(), Exit");
   462 	MCEMM_DEBUG("CMceSecureDesStream::BindStreamCrypto(), Exit");