FCL/sf/app/musicplayer: comparison mpxplugins/viewplugins/views/commonplaybackview/src/mpxcommonplaybackviewimp.cpp

equal deleted inserted replaced

-:c54d95799c80
+:a1247965635c
 {
 MPX_FUNC_EX( "CMPXCommonPlaybackViewImp::UpdateViewL" );
 if ( iContainer && !iSwitchingView )
 {
-UpdatePlaybackState( iPlaybackState );
+UpdatePlaybackStateL( iPlaybackState );
 UpdateTrackInfoL( iMedia );
 UpdateTrackPlaybackPositionL( iPosition, iDuration );
 UpdateTrackPosInPlaylistL();
 UpdateAlbumArtL( iMedia );
 UpdateDownloadStateLabelL();
 // ---------------------------------------------------------------------------
 // Update current playback state.
 // ---------------------------------------------------------------------------
 //
-EXPORT_C void CMPXCommonPlaybackViewImp::UpdatePlaybackState(
+EXPORT_C void CMPXCommonPlaybackViewImp::UpdatePlaybackStateL(
 TMPXPlaybackState aPlaybackState )
 {
 MPX_DEBUG2("CMPXCommonPlaybackViewImp::UpdatePlaybackState(%d): Entering", aPlaybackState);
 if ( iContainer && !iSwitchingView )
 TMPXPlaybackState aState,
 TInt aData )
 {
 MPX_FUNC_EX( "CMPXCommonPlaybackViewImp::DoHandleStateChangedL" );
 MPX_DEBUG2( "CMPXCommonPlaybackViewImp::DoHandleStateChangedL %d", aState );
-UpdatePlaybackState( aState );
+UpdatePlaybackStateL( aState );
 switch ( aState )
 {
 case EPbStateStopped:
 case EPbStateNotInitialised:
 case KErrCAPendingRights:
 case KErrCASizeNotDetermined:
 case KErrCANewFileHandleRequired:
 case KErrPermissionDenied:
 {
+if (aError == KErrCANoPermission ||
+aError == KErrCANoRights)
+{
+iCommonUiHelper->HandleErrorL( KMPXErrorExpiredRights, iMedia );
+}
 TBool skip(ETrue);
 if ( iMedia )
 {
 if ( iMedia->IsSupported( KMPXMediaDrmType ) )
 {
 MPX_DEBUG1("CMPXCommonPlaybackViewImp::HandleAllTracksInvalidL: Entering");
 MPX_DEBUG2("CMPXCommonPlaybackViewImp::HandleAllTracksInvalidL: iDatabaseNotReady (%d)", iDatabaseNotReady);
 iPlaybackUtility->CommandL( EPbCmdStop );
-UpdatePlaybackState( EPbStateStopped );
+UpdatePlaybackStateL( EPbStateStopped );
 TInt mpxWindowGroupId = CEikonEnv::Static()->RootWin().Identifier();
 // Usb event happened.
 if (iDatabaseNotReady)
 MPX_DEBUG2("CMPXCommonPlaybackViewImp::DoActivateL(): state = %d", iPlaybackState);
 if ( iPlaybackState == EPbStateInitialising )
 {
 delete iMedia;
 iMedia = NULL;
-UpdatePlaybackState( iPlaybackState );
+UpdatePlaybackStateL( iPlaybackState );
 UpdateTrackInfoL( iMedia );
 }
 else
 {
 // reset iNewItemOpened when Playback view is activated when state is
 {
 CleanupStack::PushL( playlist );
 if ( playlist->Count() > 0 )
 {
 RequestMediaL();
-UpdatePlaybackState( iPlaybackState );
+UpdatePlaybackStateL( iPlaybackState );
 }
 else
 {
 // playlist count is 0, no tracks
 iPlaybackState = EPbStateNotInitialised;
 aMenuPane->SetItemDimmed(
 EAknCmdHelp,
 ETrue );
 }
+// Check if HDMI cable is connected
+TBool isHDMIConnected = iTvOutConfig->HdmiCableConnected();
+aMenuPane->SetItemDimmed( EMPXPbvCmdOpenMusicSettings, isHDMIConnected );
+aMenuPane->SetItemDimmed( EMPXPbvCmdEqualizer, isHDMIConnected );
 // Check if FM Transmitter is supported
-if ( !FeatureManager::FeatureSupported( KFeatureIdFmtx ) )
+if ( !FeatureManager::FeatureSupported( KFeatureIdFmtx ) || isHDMIConnected )
 					{
 					aMenuPane->SetItemDimmed(
 						EMPXPbvCmdFMTransmitter,
 						ETrue );
 					}
 if ( iUpnpFrameworkSupport )
 {
-if ( !iMedia || !IsUpnpVisible() )
+if ( !iMedia || !IsUpnpVisibleL() )
 {
 GetCurrentPlayerDetails();
 if ( iCurrentPlayerType == EPbLocal )
 {
 aMenuPane->SetItemDimmed(
 aMenuPane->SetItemDimmed( EAknCmdExit, iExitOptionHidden );
 if (iServiceHandler->HandleSubmenuL(*aMenuPane))
 {
 return;
 }
-aMenuPane->SetItemDimmed( EMPXPbvCmdOpenMusicSettings, iTvOutConfig->HdmiCableConnected());
 }
 break;
 }
 case R_MPX_PLAYBACK_PLAY_VIA_SUB_MENU:
 {
 }
 }
 else
 {
 if ( StatusPane()->CurrentLayoutResId() !=
-R_AVKON_STATUS_PANE_LAYOUT_USUAL )
+R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT )
 {
 TRAP_IGNORE(
-StatusPane()->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_USUAL ));
+StatusPane()->SwitchLayoutL( R_AVKON_WIDESCREEN_PANE_LAYOUT_USUAL_FLAT ));
 }
 }
 iContainer->SetRect( ClientRect() );
 delete iOldUri;
 // -----------------------------------------------------------------------------
 // CMPXCommonPlaybackViewImp::IsUpnpVisible
 // Taken from Gallery upnp support implementation
 // -----------------------------------------------------------------------------
 //
-EXPORT_C TBool CMPXCommonPlaybackViewImp::IsUpnpVisible()
+EXPORT_C TBool CMPXCommonPlaybackViewImp::IsUpnpVisibleL()
 {
 MPX_FUNC( "CMPXCommonPlaybackViewImp::IsUpnpVisible" );
 TBool returnValue = EFalse;
 #ifdef UPNP_INCLUDED
 // -----------------------------------------------------------------------------
 //
 EXPORT_C TBool CMPXCommonPlaybackViewImp::IsCommandSupportedL()
 {
 TBool forwardCommand = ETrue;
-if ( iUpnpFrameworkSupport && IsUpnpVisible() )
+if ( iUpnpFrameworkSupport && IsUpnpVisibleL() )
 {
 // retrieve iCurrentPlayerType info
 GetCurrentPlayerDetails();
 if ( iCurrentPlayerType != EPbLocal)
 // ---------------------------------------------------------------------------
 // Updates the middle toolbar button
 // ---------------------------------------------------------------------------
 //
-EXPORT_C void CMPXCommonPlaybackViewImp::UpdateToolbar()
+EXPORT_C void CMPXCommonPlaybackViewImp::UpdateToolbarL()
 {
-MPX_FUNC("CMPXCommonPlaybackViewImp::UpdateToolbar");
+MPX_FUNC("CMPXCommonPlaybackViewImp::UpdateToolbarL");
 if ( AknLayoutUtils::PenEnabled() )
 {
 if ( Toolbar() )
 {
 // Callback function of timer to handle delayed error
 // ----------------------------------------------------------------------------
 //
 TInt CMPXCommonPlaybackViewImp::HandleDelayedError( TAny* aPtr )
 {
+	TInt ret( KErrNone );
 CMPXCommonPlaybackViewImp* pv = reinterpret_cast<CMPXCommonPlaybackViewImp*>( aPtr );
 pv->iDelayedErrorTimer->Cancel();
 // compare index
 if ( pv->iPlaybackUtility )
 	{
 MMPXSource* source( pv->iPlaybackUtility->Source() );
 if ( source )
 	    {
-CMPXCollectionPlaylist* pl( source->PlaylistL() );
+CMPXCollectionPlaylist* pl( NULL );
-	if ( pl )
+MPX_TRAP( ret, pl = source->PlaylistL() );
-{
+if( ret != KErrNone )
-CleanupStack::PushL( pl );
+	{
-if ( pv->iErrIndex == pl->Index() )
+return ret;
-	{
+	}
-	pv->HandleErrorL( pv->iLastDelayedErr );
-	}
+			if ( pv->iErrIndex == pl->Index() )
-CleanupStack::PopAndDestroy( pl );
+				{
-}
+				MPX_TRAP( ret, pv->HandleErrorL( pv->iLastDelayedErr ) );
+				}
+			delete pl;
+			pl = NULL;
 }
 	}
-return KErrNone;
+return ret;
 }
 // ---------------------------------------------------------------------------
 // Updates track's album art.
 // ---------------------------------------------------------------------------
 CAknToolbar* toolbar = Toolbar();
 if ( toolbar )
 {
 toolbar->SetToolbarVisibility(EFalse);
 }
-iViewUtility->ActivateViewL( TUid::Uid(KMPXPluginTypeMetadataEditorUid) );
+TRAP_IGNORE( iViewUtility->ActivateViewL( TUid::Uid(KMPXPluginTypeMetadataEditorUid) ) );
 if ( toolbar )
 {
 toolbar->SetToolbarVisibility(ETrue);
 }
 }

branch	RCL_3
changeset 21	a1247965635c
parent 18	c54d95799c80
child 26	70a8526f03f2