# HG changeset patch # User William Roberts # Date 1268572158 0 # Node ID a914e47e7a01eb16152bf08b18e1b97b5376eb9e # Parent c97423828d284472805782c6ac5b71d700610f50# Parent 13afc0e517bd81ba63e454407a1f0acc77239b76 Automatic merge from PDK_3.0.h diff -r 13afc0e517bd -r a914e47e7a01 mpxplugins/serviceplugins/playbackplugins/progressdownloadsb/src/mpxprogressdownloadsb.cpp --- a/mpxplugins/serviceplugins/playbackplugins/progressdownloadsb/src/mpxprogressdownloadsb.cpp Fri Feb 19 22:48:30 2010 +0200 +++ b/mpxplugins/serviceplugins/playbackplugins/progressdownloadsb/src/mpxprogressdownloadsb.cpp Sun Mar 14 13:09:18 2010 +0000 @@ -320,6 +320,7 @@ break; } case EPbCmdPause: + { if ( EPbDlStateDownloadCompleted == iDownloadState && iConsumeStarted ) { ConsumeRights( ContentAccess::EPause ); @@ -327,7 +328,9 @@ TInt ret = iMStreamControl->Pause(); iObs->HandlePluginEvent(MMPXPlaybackPluginObserver::EPPaused, 0, ret); break; + } case EPbCmdStop: + { iMStreamControl->Stop(); iObs->HandlePluginEvent(MMPXPlaybackPluginObserver::EPStopped, 0, KErrNone); @@ -343,7 +346,9 @@ } iDrmMediaUtility->Close(); break; + } case EPbCmdClose: + { if ( EPbDlStateDownloadCompleted == iDownloadState && iConsumeStarted ) { ConsumeRights( ContentAccess::EStop ); @@ -360,6 +365,7 @@ iObs->HandlePluginEvent(MMPXPlaybackPluginObserver::EPClosed, 0, KErrNone); break; + } } }