accessoryservices/accessoryserver/src/Server/AccSrvConnectionController.cpp
branchRCL_3
changeset 8 8d1d8440b626
parent 3 a811597961f0
child 9 21e939dd208a
equal deleted inserted replaced
7:1fc153c72b60 8:8d1d8440b626
   760     TAccPolGenericIDArray genericIDArray;
   760     TAccPolGenericIDArray genericIDArray;
   761     TAccPolAccessoryMode accMode;
   761     TAccPolAccessoryMode accMode;
   762 
   762 
   763     iServerModel->CurrentConnectionStatusL( genericIDArray );
   763     iServerModel->CurrentConnectionStatusL( genericIDArray );
   764 
   764 
       
   765     if( (EFalse == aAudioOutputStatus) && (KErrUnknown != aDbId) ) 
       
   766         { 
       
   767         TInt index( TAccPolGenericIDArrayAccessor::FindWithUniqueIDL( 
       
   768                 genericIDArray, aDbId) ); 
       
   769         TAccPolGenericIDArrayAccessor::RemoveIndexFromGenericIDArray(genericIDArray, index); 
       
   770         }
       
   771 
   765     accMode = iPolicy->ResolveAccessoryModeL( genericIDArray, 
   772     accMode = iPolicy->ResolveAccessoryModeL( genericIDArray, 
   766                                               aDbId, 
   773                                               aDbId, 
   767                                               aAudioOutputStatus, 
   774                                               aAudioOutputStatus, 
   768                                               iServerModel->AccessoryMode(), 
   775                                               iServerModel->AccessoryMode(), 
   769                                               iServerModel->UniqueID() );
   776                                               iServerModel->UniqueID() );
   799 			    case EAccModeHeadphones:
   806 			    case EAccModeHeadphones:
   800 			    {
   807 			    {
   801 				  TAccPolGenericID genericID;
   808 				  TAccPolGenericID genericID;
   802 				  iServerModel->GetLastConnectedAccessoryL( genericID );
   809 				  iServerModel->GetLastConnectedAccessoryL( genericID );
   803 				  TUint32 num = genericID.SubblockCaps();
   810 				  TUint32 num = genericID.SubblockCaps();
   804 				  if( num & KSBAudioSubblock )
   811 				  if ( genericID.PhysicalConnectionCaps() != KPCHDMI ) // No info note for HDMI
   805 				      {
   812 				      {
   806 					    CCapValue* capValue = iServerModel->CapabilityStorage().GetCapability( genericID, KAccIntegratedAudioInput );
   813                       if( num & KSBAudioSubblock )
   807 					    if( iInformationNoteDefault )
   814                           {
   808 						      {
   815                             CCapValue* capValue = iServerModel->CapabilityStorage().GetCapability( genericID, KAccIntegratedAudioInput );
   809 						      noteValue = iInformationNoteDefault;
   816                             if( iInformationNoteDefault )
   810 						      showNote = ETrue;
   817                                   {
   811 						      }
   818                                   noteValue = iInformationNoteDefault;
   812 					    if( !capValue && !iInformationNoteDefault )
   819                                   showNote = ETrue;
   813 						      {
   820                                   }
   814 						      showNote = ETrue;
   821                             if( !capValue && !iInformationNoteDefault )
   815 						      }
   822                                   {
   816 					    }
   823                                   showNote = ETrue;
   817 				    else
   824                                   }
   818 					    {
   825                             }
   819 					    if( iInformationNoteDefault )
   826                         else
   820 						      {
   827                             {
   821 						      noteValue = iInformationNoteDefault;
   828                             if( iInformationNoteDefault )
   822 						      showNote = ETrue;
   829                                   {
   823 						      }
   830                                   noteValue = iInformationNoteDefault;
   824 					    }
   831                                   showNote = ETrue;
       
   832                                   }
       
   833                             }
       
   834 				      }
   825 				  }
   835 				  }
   826 			    break;			  
   836 			    break;			  
   827 			    default:
   837 			    default:
   828 			    {
   838 			    {
   829 				  showNote = EFalse;				
   839 				  showNote = EFalse;