FCL/sf/app/musicplayer: comparison mpxmusicplayer/app/src/mpxappui.cpp

equal deleted inserted replaced

-:c54d95799c80
+:a1247965635c
 //check memory
 #ifdef FF_OOM_MONITOR2_COMPONENT
 CheckAvailableMemoryByOomL( KLowestMemoryNeeded );
 #else
-CheckAvailableMemory( KLowestMemoryNeeded );
+CheckAvailableMemoryL( KLowestMemoryNeeded );
 #endif    //FF_OOM_MONITOR2_COMPONENT
 if ( !IsEmbedded() )
 {
 // Do we support podcasting in music player?
 //
 CMPXAppUi::~CMPXAppUi()
 {
 MPX_DEBUG1( "-->CMPXAppUi::~CMPXAppUi()" );
 #ifdef FF_OOM_MONITOR2_COMPONENT
-SetMpxOomPriorityL( ROomMonitorSession::EOomPriorityNormal );
+TRAP_IGNORE( SetMpxOomPriorityL( ROomMonitorSession::EOomPriorityNormal ) );
 #endif //FF_OOM_MONITOR2_COMPONENT
 if ( !IsEmbedded() )
 {
 CMPXCommonUiHelper::SetStandAloneModePId( 0 );
 switch ( aCommand )
 {
 case EPbCmdSetVolume:
 {
+TRAP_IGNORE(
 TMPXPlaybackState playerState( EPbStateNotInitialised );
 playerState = iPlaybackUtility->StateL();
 if ( !MPXUser::IsCallOngoing( KMPXCallTypeGenericVoice ) ||
 ( playerState == EPbStatePlaying ) ||
 ( playerState == EPbStateSeekingForward ) ||
 // or if we're actively playing during call
 if ( IsForeground() || EPbStatePlaying == playerState || EPbStatePlaying == pdPlayerState )
 {
 					if ( aData != iCurrentVolume )
 {
-SetVolume( aData );
+SetVolumeL( aData );
 }
 // popup volume control even if volume didn't change
 HandlePopupL( EPbCmdSetVolume );
 }
 }
+);
 break;
 }
 case EPbCmdMuteVolume:
 {
+TRAP_IGNORE(
 TMPXPlaybackState playerState( EPbStateNotInitialised );
 playerState = iPlaybackUtility->StateL();
 if ( !MPXUser::IsCallOngoing( KMPXCallTypeGenericVoice ) ||
 ( playerState == EPbStatePlaying ) ||
 ( playerState == EPbStateSeekingForward ) ||
 }
 // only process command if there no call ongoing
 // or if we're actively playing during call
 if ( IsForeground() || EPbStatePlaying == playerState || EPbStatePlaying == pdPlayerState )
 {
-MuteVolume();
+MuteVolumeL();
 HandlePopupL( EPbCmdMuteVolume );
 }
 }
+);
 break;
 }
 case EPbCmdUnMuteVolume:
 {
+TRAP_IGNORE(
 TMPXPlaybackState playerState( EPbStateNotInitialised );
 playerState = iPlaybackUtility->StateL();
 if ( !MPXUser::IsCallOngoing( KMPXCallTypeGenericVoice ) ||
 ( playerState == EPbStatePlaying ) ||
 ( playerState == EPbStateSeekingForward ) ||
 {
 pdPlayerState = iPdParameterHandler->PdStateL();
 }
 if ( IsForeground() || EPbStatePlaying == playerState || EPbStatePlaying == pdPlayerState )
 {
-UnMuteVolume();
+UnMuteVolumeL();
 HandlePopupL( EPbCmdUnMuteVolume );
 }
 }
+);
 break;
 }
 default:
 {
 // Dispatches all other commands
 {
 // Forward the command to view to handle when
 // music is foreground app and not displaying
 // dialogs or the options menu
 if ( iView )
 {
-MPX_DEBUG2( "CMPXAppUi::HandleMediaKeyCommand sending command %d to view", MPXCmdForPbCmd(aCommand) );
+MPX_TRAPD( err, iView->HandleCommandL( MPXCmdForPbCmd(aCommand) ) );
-iView->HandleCommandL( MPXCmdForPbCmd(aCommand) );
+MPX_DEBUG3( "CMPXAppUi::HandleMediaKeyCommand sending command %d to view err%d", MPXCmdForPbCmd(aCommand), err );
 }
 }
 else
 {
 TMPXPlaybackState playerState( EPbStateNotInitialised );
-playerState = iPlaybackUtility->StateL();
+MPX_TRAPD( err, playerState = iPlaybackUtility->StateL() );
 if ( foregroundApp && IsDisplayingDialog() )
 {
 // displaying dialog in the foreground
 if ( EPbStatePlaying == playerState ||
 EPbStatePaused == playerState ||
 aCommand == EPbCmdPlay ||
 aCommand == EPbCmdPlayPause  )
 {
 // In playing/paused state, all media keys are active.
 // Now playing view is not bring to foreground.
 // Seeking forward/backwards is also "playing"
-MPX_DEBUG2( "CMPXAppUi::HandleMediaKeyCommand Dialog displaying, sending command %d to DoHandleMediaKeyCommandL", aCommand );
+MPX_TRAP( err, DoHandleMediaKeyCommandL( aCommand ) );
-DoHandleMediaKeyCommandL( aCommand );
+MPX_DEBUG3( "CMPXAppUi::HandleMediaKeyCommand Dialog displaying, sending command %d to DoHandleMediaKeyCommandL err%d", aCommand, err );
 }
 else
 {
-MPX_DEBUG2( "CMPXAppUi::HandleMediaKeyCommand Dialog displaying, inactive state, command %d ignored", aCommand );
+MPX_DEBUG3( "CMPXAppUi::HandleMediaKeyCommand Dialog displaying, inactive state, command %d, err%d ignored", aCommand , err );
 }
 }
 else
 {
 // displaying menu/not foreground, pass to view to handle only play command
 if ( EPbStatePlaying == playerState ||
 EPbStatePaused == playerState ||
 EPbStateSeekingForward == playerState ||
 EPbStateSeekingBackward == playerState )
 {
-MPX_DEBUG2( "CMPXAppUi::HandleMediaKeyCommand Menu displaying/not foreground, sending command %d to DoHandleMediaKeyCommandL", aCommand );
+MPX_TRAP( err, DoHandleMediaKeyCommandL( aCommand ) );
-DoHandleMediaKeyCommandL( aCommand );
+MPX_DEBUG3( "CMPXAppUi::HandleMediaKeyCommand Menu displaying/not foreground, sending command %d to DoHandleMediaKeyCommandL err%d", aCommand, err );
 }
 else if ( ( aCommand == EPbCmdPlay || aCommand == EPbCmdPlayPause ) && iView )
 {
 if ( !foregroundApp )
 {
-MPX_DEBUG2( "CMPXAppUi::HandleMediaKeyCommand Menu displaying/not foreground, active idle foreground, sending command %d to DoHandleMediaKeyCommandL", aCommand );
 // not foreground, play without loading playback view
-DoHandleMediaKeyCommandL( aCommand );
+MPX_TRAP( err, DoHandleMediaKeyCommandL( aCommand ) );
+MPX_DEBUG3( "CMPXAppUi::HandleMediaKeyCommand Menu displaying/not foreground, active idle foreground, sending command %d to DoHandleMediaKeyCommandL err%d", aCommand, err );
 }
 else
 {
-MPX_DEBUG2( "CMPXAppUi::HandleMediaKeyCommand Menu displaying/not foreground, sending command %d to view", aCommand );
+MPX_TRAP( err, iView->HandleCommandL( MPXCmdForPbCmd(aCommand) ) );
-iView->HandleCommandL( MPXCmdForPbCmd(aCommand) );
+MPX_DEBUG3( "CMPXAppUi::HandleMediaKeyCommand Menu displaying/not foreground, sending command %d to view err%d", aCommand, err );
 }
 }
 else if ( aCommand == EPbCmdPlay || aCommand == EPbCmdPlayPause )
 {
 // play command without a view, this case
 }
 }
 else if ( op == EMcMsgDiskRemoved )
 {
-if ( !IsEmbedded() )
+TBool usbDiskRemovalEvent( EFalse );
-{
+if ( (op == EMcMsgDiskRemoved) && iIsUsbOnGoing )
-TBool usbDiskRemovalEvent(EFalse);
+{
-if ( (op == EMcMsgDiskRemoved) && iIsUsbOnGoing )
+usbDiskRemovalEvent = ETrue;
-{
+}
-usbDiskRemovalEvent = ETrue;
+else
-}
+{
-else
+MPX_DEBUG1( "CMPXAppUi::HandleBroadcastMessageL. MMC ejected and the application needs to close." );
-{
+RunAppShutter();
-MPX_DEBUG1( "CMPXAppUi::HandleBroadcastMessageL. MMC ejected and the application needs to close." );
+return;
-RunAppShutter();
+}
-				return;
-}
 CMPXCollectionPath* cPath = iCollectionUtility->Collection().PathL ( );
 CleanupStack::PushL ( cPath );
 if ( cPath->Levels ( )> 1 && !iFormattingOnGoing && !usbDiskRemovalEvent &&
 iCurrentViewType.iUid != KMPXPluginTypePlaybackUid )
 {
+cPath->Back();
-cPath->Back ( );
+iCollectionUtility->Collection().OpenL( *cPath );
-iCollectionUtility->Collection().OpenL ( *cPath );
+}
-}
+CleanupStack::PopAndDestroy( cPath );
-CleanupStack::PopAndDestroy ( cPath );
-}
 }
 // Re-open the collection view after a refresh
 // and after album art or metadata dialog or add songs editor dialog closes
 if (((op == EMcMsgRefreshEnd ) || (op == EMcMsgUSBMassStorageEnd))
 && (IsActiveView(KMPXPluginTypeAlbumArtEditorUid)
 else if ( aMessageUid == KNullUid )
 {
 ASSERT(!IsEmbedded());////browser should not send messages to music player if it is not RootApp.
 if ( aMessageParameters.Length() )
 {
-if ( IsBrowserClosed(aMessageParameters) )
+if ( IsBrowserClosedL(aMessageParameters) )
 {
 if ( iAppStartedByBrowser )
 {
 RunAppShutter();
 return EMessageHandled;
 iAppStartedByBrowser = ETrue;
 iPdPbvStartedByBrowser = ETrue;
 // Convert param to 8-bit.
 HBufC8* param8 = HBufC8::NewLC( param.Length() );
 param8->Des().Copy( param );
-if ( IsBrowserClosed(*param8) )
+if ( IsBrowserClosedL(*param8) )
 {
 Exit();
 }
 else
 {
 {
 RunAppShutter();
 }
 #ifdef RD_BROWSER_PROGRESSIVE_DOWNLOAD
 // -----------------------------------------------------------------------------
-// CMPXAppUi::IsBrowserClosed
+// CMPXAppUi::IsBrowserClosedL
 // -----------------------------------------------------------------------------
 //
-TBool CMPXAppUi::IsBrowserClosed(
+TBool CMPXAppUi::IsBrowserClosedL(
 const TDesC8& aParams )
 {
 TBool ret(EFalse);
 CBufFlat* paramBuf = CBufFlat::NewL( /*anExpandSize*/1 );
 CleanupStack::PushL( paramBuf );
 return ( iStandAlone );
 #endif
 }
 // -----------------------------------------------------------------------------
-// CMPXAppUi::SetVolume
+// CMPXAppUi::SetVolumeL
 // -----------------------------------------------------------------------------
 //
-void CMPXAppUi::SetVolume( const TInt aVolume )
+void CMPXAppUi::SetVolumeL( const TInt aVolume )
 {
 CMPXCommand* cmd( CMPXCommand::NewL() );
 CleanupStack::PushL( cmd );
 cmd->SetTObjectValueL<TInt>( KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral );
 cmd->SetTObjectValueL<TBool>( KMPXCommandGeneralDoSync, ETrue );
 CleanupStack::PopAndDestroy( cmd );
 }
 // -----------------------------------------------------------------------------
-// CMPXAppUi::MuteVolume
+// CMPXAppUi::MuteVolumeL
 // -----------------------------------------------------------------------------
 //
-void CMPXAppUi::MuteVolume()
+void CMPXAppUi::MuteVolumeL()
 {
 CMPXCommand* cmd( CMPXCommand::NewL() );
 CleanupStack::PushL( cmd );
 cmd->SetTObjectValueL<TInt>( KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral );
 cmd->SetTObjectValueL<TBool>( KMPXCommandGeneralDoSync, ETrue );
 CleanupStack::PopAndDestroy( cmd );
 }
 // -----------------------------------------------------------------------------
-// CMPXAppUi::UnMuteVolume
+// CMPXAppUi::UnMuteVolumeL
 // -----------------------------------------------------------------------------
 //
-void CMPXAppUi::UnMuteVolume()
+void CMPXAppUi::UnMuteVolumeL()
 {
 CMPXCommand* cmd( CMPXCommand::NewL() );
 CleanupStack::PushL( cmd );
 cmd->SetTObjectValueL<TInt>( KMPXCommandGeneralId, KMPXCommandIdPlaybackGeneral );
 cmd->SetTObjectValueL<TBool>( KMPXCommandGeneralDoSync, ETrue );
 }
 return cmd;
 }
 // -----------------------------------------------------------------------------
-// CMPXAppUi::CheckAvailableMemory
+// CMPXAppUi::CheckAvailableMemoryL
 // -----------------------------------------------------------------------------
 //
-void CMPXAppUi::CheckAvailableMemory( TInt aNeedMemory )
+void CMPXAppUi::CheckAvailableMemoryL( TInt aNeedMemory )
 {
 TMemoryInfoV1Buf info;
 UserHal::MemoryInfo(info);
 if( info().iFreeRamInBytes < aNeedMemory )
 {

branch	RCL_3
changeset 21	a1247965635c
parent 18	c54d95799c80
child 28	56b11cf8addb