equal
deleted
inserted
replaced
470 { |
470 { |
471 aValue = iVolumeSteps; |
471 aValue = iVolumeSteps; |
472 } |
472 } |
473 } |
473 } |
474 |
474 |
475 if( iMuted && aValue > 0 ) // unmute |
475 if( !iMuted && aValue > 0 ) // unmute |
476 { |
476 { |
477 iMuted = EFalse; |
477 iMuted = EFalse; |
478 iCurrentVol = aValue; |
478 iCurrentVol = aValue; |
479 iVolPopup->SetValue( iCurrentVol ); |
479 iVolPopup->SetValue( iCurrentVol ); |
480 } |
480 } |
1105 } |
1105 } |
1106 case ERemConCoreApiVolumeUp: |
1106 case ERemConCoreApiVolumeUp: |
1107 case ERemConCoreApiVolumeDown: |
1107 case ERemConCoreApiVolumeDown: |
1108 { |
1108 { |
1109 iTimer->Cancel(); |
1109 iTimer->Cancel(); |
1110 |
1110 MMPXPlaybackUtility* pbUtil( NULL ); |
1111 MMPXPlaybackUtility* pbUtil = MMPXPlaybackUtility::UtilityL( KPbModeActivePlayer ); |
1111 MPX_TRAPD( err, pbUtil = MMPXPlaybackUtility::UtilityL( KPbModeActivePlayer )); |
1112 CleanupClosePushL(*pbUtil); |
1112 if( err != KErrNone ) |
1113 |
1113 { |
|
1114 MPX_DEBUG2( "CMPXMediaKeyHandlerImp::MrccatoCommand ERemConCoreApiVolumeDown leave err%d", err ); |
|
1115 break; |
|
1116 } |
1114 TMPXPlaybackState playerState( EPbStateNotInitialised ); |
1117 TMPXPlaybackState playerState( EPbStateNotInitialised ); |
1115 playerState = pbUtil->StateL(); |
1118 TRAP_IGNORE( playerState = pbUtil->StateL()); |
1116 |
1119 pbUtil->Close(); |
1117 CleanupStack::PopAndDestroy(pbUtil); |
1120 pbUtil = NULL; |
1118 |
1121 |
1119 if( playerState == EPbStatePlaying || IsAppForeground() ) |
1122 if( playerState == EPbStatePlaying || IsAppForeground() ) |
1120 { |
1123 { |
1121 iIncreaseVol = (aOperationId == ERemConCoreApiVolumeUp ? ETrue: EFalse); |
1124 iIncreaseVol = (aOperationId == ERemConCoreApiVolumeUp ? ETrue: EFalse); |
1122 switch (aButtonAct) |
1125 switch (aButtonAct) |
1123 { |
1126 { |