Automatic merge from PDK_3.0.h CompilerCompatibility
authorWilliam Roberts <williamr@symbian.org>
Sun, 14 Mar 2010 13:09:18 +0000
branchCompilerCompatibility
changeset 13 a914e47e7a01
parent 10 c97423828d28 (diff)
parent 11 13afc0e517bd (current diff)
child 16 602229933e69
Automatic merge from PDK_3.0.h
mpxmusicplayer/activeidle/aiplayerplugin/data/aiplayerplugin.rss
mpxmusicplayer/activeidle/aiplayerplugin/data/aiplayerpluginresource.rss
mpxmusicplayer/activeidle/aiplayerplugin/group/aiplayerplugin.mmp
mpxmusicplayer/activeidle/aiplayerplugin/group/bld.inf
mpxmusicplayer/activeidle/aiplayerplugin/inc/aiplayerplugin.h
mpxmusicplayer/activeidle/aiplayerplugin/inc/aiplayerplugincontentmodel.h
mpxmusicplayer/activeidle/aiplayerplugin/inc/aiplayerpluginengine.h
mpxmusicplayer/activeidle/aiplayerplugin/inc/aiplayerpluginengineobserver.h
mpxmusicplayer/activeidle/aiplayerplugin/inc/aiplayerpluginuids.hrh
mpxmusicplayer/activeidle/aiplayerplugin/loc/aiplayerplugin.loc
mpxmusicplayer/activeidle/aiplayerplugin/src/aiplayerplugin.cpp
mpxmusicplayer/activeidle/aiplayerplugin/src/aiplayerpluginengine.cpp
mpxmusicplayer/activeidle/group/bld.inf
mpxmusicplayer/activeidle/rom/mpxactiveidleplugin.iby
mpxmusicplayer/activeidle/rom/mpxactiveidlepluginrsc.iby
--- 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;
+				}
             }
         }