equal
deleted
inserted
replaced
132 |
132 |
133 TRAP_IGNORE( iCurrentCallHandler = CVRSystemEventHandler::NewL() ); |
133 TRAP_IGNORE( iCurrentCallHandler = CVRSystemEventHandler::NewL() ); |
134 iCurrentCallHandler->Listen( KPSUidCtsyCallInformation, KCTsyCallState, |
134 iCurrentCallHandler->Listen( KPSUidCtsyCallInformation, KCTsyCallState, |
135 this ); |
135 this ); |
136 //listen MMC eject |
136 //listen MMC eject |
137 iCurrentMMCEjectHandler = CVRMediaRemovalMonitor::NewL(EDriveF, CEikonEnv::Static()->FsSession(), this); |
137 TInt driveRemovableMassStorage = VRUtils::GetRemovableMassStorageL(); |
|
138 iCurrentMMCEjectHandler = CVRMediaRemovalMonitor::NewL(driveRemovableMassStorage, CEikonEnv::Static()->FsSession(), this); |
138 |
139 |
139 if ( FeatureManager::FeatureSupported( KFeatureIdKeypadNoVoiceKey ) && |
140 if ( FeatureManager::FeatureSupported( KFeatureIdKeypadNoVoiceKey ) && |
140 FeatureManager::FeatureSupported( |
141 FeatureManager::FeatureSupported( |
141 KFeatureIdApplicationControllableAudioRouting ) ) |
142 KFeatureIdApplicationControllableAudioRouting ) ) |
142 { |
143 { |
1587 { |
1588 { |
1588 iCanHandleCommands = ETrue; |
1589 iCanHandleCommands = ETrue; |
1589 iCBAEnabled = ETrue; |
1590 iCBAEnabled = ETrue; |
1590 if ( leaveErr1 == KErrDiskFull || leaveErr2 == KErrDiskFull ) |
1591 if ( leaveErr1 == KErrDiskFull || leaveErr2 == KErrDiskFull ) |
1591 { |
1592 { |
1592 if ( iMemo->StorageDrive() == EDriveF) |
1593 if ( iMemo->StorageDrive() == VRUtils::GetRemovableMassStorageL()) |
1593 { |
1594 { |
1594 VRUtils::ShowMemoryFullConfirmationQuery(ETrue); |
1595 VRUtils::ShowMemoryFullConfirmationQuery(ETrue); |
1595 } |
1596 } |
1596 else |
1597 else |
1597 { |
1598 { |
2424 void CVRRecViewModel::HandleMMCEjectEventL() |
2425 void CVRRecViewModel::HandleMMCEjectEventL() |
2425 { |
2426 { |
2426 |
2427 |
2427 // Actions to take when recording |
2428 // Actions to take when recording |
2428 TInt storageDrive = VRUtils::MemoDriveL(); |
2429 TInt storageDrive = VRUtils::MemoDriveL(); |
2429 if ( storageDrive == EDriveF && !CVRUSBStateHanlder::IsUsbActive()) |
2430 if ( storageDrive == VRUtils::GetRemovableMassStorageL() && !CVRUSBStateHanlder::IsUsbActive()) |
2430 { |
2431 { |
2431 //exit for mmc dismount |
2432 //exit for mmc dismount |
2432 TWsEvent event; |
2433 TWsEvent event; |
2433 event.SetType( EAknSoftkeyExit ); |
2434 event.SetType( EAknSoftkeyExit ); |
2434 event.SetTimeNow(); |
2435 event.SetTimeNow(); |