diff -r 0aa8cc770c8a -r 4a793f564d72 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropdesc.cpp
--- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropdesc.cpp	Tue Aug 31 16:03:15 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,312 +0,0 @@
-// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-/**
- @file
- @internalComponent
-*/
-
-#include <mtp/cmtptypedevicepropdesc.h>
-
-#include "cmtppbcgetdevicepropdesc.h"
-#include "mtpplaybackcontroldpconst.h"
-#include "cmtpplaybackcontroldp.h"
-#include "cmtpplaybackproperty.h"
-#include "cmtpplaybackmap.h"
-#include "cmtpplaybackcommand.h"
-#include "mtpplaybackcontrolpanic.h"
-
-// Class constants.
-__FLOG_STMT(_LIT8(KComponent,"GetPlaybackDevicePropDesc");)
-
-/**
-Two-phase constructor.
-@param aPlugin The data provider plugin
-@param aFramework The data provider framework
-@param aConnection The connection from which the request comes
-@return a pointer to the created request processor object
-*/  
-MMTPRequestProcessor* CMTPPbcGetDevicePropDesc::NewL(MMTPDataProviderFramework& aFramework,
-                                                MMTPConnection& aConnection, 
-                                                CMTPPlaybackControlDataProvider& aDataProvider)
-    {
-    CMTPPbcGetDevicePropDesc* self = new (ELeave) CMTPPbcGetDevicePropDesc(aFramework, aConnection, aDataProvider);
-    return self;
-    }
-
-/**
-Destructor.
-*/    
-CMTPPbcGetDevicePropDesc::~CMTPPbcGetDevicePropDesc()
-    {    
-    __FLOG(_L8("~CMTPPbcGetDevicePropDesc - Entry"));
-    delete iPropDesc;
-    delete iPbCmd;
-    __FLOG(_L8("~CMTPPbcGetDevicePropDesc - Exit"));
-    __FLOG_CLOSE;
-    }
-
-/**
-Constructor.
-*/    
-CMTPPbcGetDevicePropDesc::CMTPPbcGetDevicePropDesc(MMTPDataProviderFramework& aFramework,
-                                            MMTPConnection& aConnection, 
-                                            CMTPPlaybackControlDataProvider& aDataProvider) :
-    CMTPRequestProcessor(aFramework, aConnection, 0, NULL),
-    iPlaybackControlDp(aDataProvider)
-    {
-    //Open the log system
-    __FLOG_OPEN(KMTPSubsystem, KComponent);
-    }
-    
-/**
-GetDevicePropDesc request validator.
-@return EMTPRespCodeOK if request is verified, otherwise one of the error response codes
-*/
-TMTPResponseCode CMTPPbcGetDevicePropDesc::CheckRequestL()
-    {
-    __FLOG(_L8("CheckRequestL - Entry"));
-    TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL();
-    if(respCode == EMTPRespCodeOK)
-        {
-        respCode = EMTPRespCodeDevicePropNotSupported;
-        TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1);
-        const TInt count = sizeof(KMTPPlaybackControlDpSupportedProperties) / sizeof(KMTPPlaybackControlDpSupportedProperties[0]);
-        for (TUint i(0); (i < count); i++)
-            {
-            if (propCode == KMTPPlaybackControlDpSupportedProperties[i])
-                {
-                respCode = EMTPRespCodeOK;
-                break;
-                }
-            }
-        }
-
-    __FLOG(_L8("CheckRequestL - Exit"));
-    return respCode;
-    }
-
-/**
-GetDevicePropDesc request handler.
-*/    
-void CMTPPbcGetDevicePropDesc::ServiceL()
-    {
-    __FLOG(_L8("ServiceL - Entry"));
-    //Destroy the previous playback command.
-    delete iPbCmd;
-    iPbCmd = NULL;
-    
-    //Get the device property code
-    TMTPDevicePropertyCode propCode(static_cast<TMTPDevicePropertyCode>(Request().
-                                    Uint32(TMTPTypeRequest::ERequestParameter1)));
-    
-    TMTPPbCtrlData data;
-    data.iOptCode = EMTPOpCodeGetDevicePropDesc;
-    data.iDevPropCode = propCode;
-
-    //Get a new playback command.
-    CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap());
-    TInt result = map.GetPlaybackControlCommand(data, &iPbCmd);
-
-    if(KErrNone == result)
-        {
-        MMTPPlaybackControl& control(iPlaybackControlDp.GetPlaybackControlL());
-        TRAPD(err, control.CommandL(*iPbCmd, this));
-        __ASSERT_ALWAYS((err == KErrNone), SendResponseL(EMTPRespCodeParameterNotSupported));
-        }
-    else if(KErrNotSupported == result)
-        {
-        SendResponseL(EMTPRespCodeDevicePropNotSupported);
-        }
-    else
-        {
-        SendResponseL(EMTPRespCodeParameterNotSupported);
-        }
-
-    __FLOG(_L8("ServiceL - Exit"));
-    }
-
-void CMTPPbcGetDevicePropDesc::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr)
-    {
-    __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry"));
-    __FLOG_1(_L8("aErr %d"), aErr);
-
-    TBool useDefault = EFalse;
-    switch(aErr)
-        {
-        case KPlaybackErrNone:
-            {
-            __ASSERT_DEBUG((aCmd != NULL), Panic(EMTPPBDataNullErr));
-            __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr));
-            __ASSERT_ALWAYS((aCmd != NULL), User::Leave(KErrArgument));
-            __ASSERT_ALWAYS((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), User::Leave(KErrArgument));
-            __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand());
-            }
-            break;
-        case KPlaybackErrContextInvalid:
-            {
-            useDefault = ETrue;
-            }
-            break;
-        case KPlaybackErrDeviceUnavailable:
-            {
-            iPlaybackControlDp.RequestToResetPbCtrl();
-            SendResponseL(EMTPRespCodeDeviceBusy);
-            }
-            return;
-
-        default:
-            {
-            SendResponseL(EMTPRespCodeDeviceBusy);
-            }
-            return;
-        }
-
-    delete iPropDesc;
-    iPropDesc = NULL;
-    
-    CMTPPlaybackProperty& property(iPlaybackControlDp.GetPlaybackProperty());
-    TMTPDevicePropertyCode propCode = static_cast<TMTPDevicePropertyCode>
-                                      (Request().Uint32(TMTPTypeRequest::ERequestParameter1));
-
-    switch (propCode)
-        {
-        case EMTPDevicePropCodeVolume:
-            {
-            TMTPPbDataVolume volSet(1,0,1,1,1);
-            if(useDefault)
-                {
-                 property.GetDefaultVolSet(volSet);
-                }
-            else
-                {
-                volSet = aCmd->ParamL().VolumeSetL();
-                property.SetDefaultVolSetL(volSet);
-                }
-
-            CMTPTypeDevicePropDescRangeForm* form = CMTPTypeDevicePropDescRangeForm::NewLC(EMTPTypeUINT32);
-            form->SetUint32L(CMTPTypeDevicePropDescRangeForm::EMaximumValue, volSet.MaxVolume());
-            form->SetUint32L(CMTPTypeDevicePropDescRangeForm::EMinimumValue, volSet.MinVolume());
-            form->SetUint32L(CMTPTypeDevicePropDescRangeForm::EStepSize, volSet.Step());
-            iPropDesc = CMTPTypeDevicePropDesc::NewL(propCode,
-                                                     CMTPTypeDevicePropDesc::EReadWrite, 
-                                                     CMTPTypeDevicePropDesc::ERangeForm,
-                                                     form);
-
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, volSet.DefaultVolume());
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::ECurrentValue, volSet.CurrentVolume());
-            CleanupStack::PopAndDestroy(form);
-            SendDataL(*iPropDesc); 
-            }
-            break;
-
-        case EMTPDevicePropCodePlaybackRate:
-            {
-            CMTPTypeDevicePropDescEnumerationForm* form = CMTPTypeDevicePropDescEnumerationForm::
-                                                          NewLC(EMTPTypeINT32);
-            CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap());
-
-            TInt32 val = map.PlaybackRateL(EPlayStateBackwardSeeking);
-            TMTPTypeInt32 value(val);
-            form->AppendSupportedValueL(value);
-            
-            val = map.PlaybackRateL(EPlayStatePaused);
-            value.Set(val);
-            form->AppendSupportedValueL(value);
-            
-            val = map.PlaybackRateL(EPlayStatePlaying);
-            value.Set(val);
-            form->AppendSupportedValueL(value);
-            
-            val = map.PlaybackRateL(EPlayStateForwardSeeking);
-            value.Set(val);
-            form->AppendSupportedValueL(value);
-
-            iPropDesc = CMTPTypeDevicePropDesc::NewL(propCode,
-                                                     CMTPTypeDevicePropDesc::EReadWrite, 
-                                                     CMTPTypeDevicePropDesc::EEnumerationForm,
-                                                     form);
-
-            property.GetDefaultPropertyValueL(propCode, val);
-            iPropDesc->SetInt32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, val);
-
-            if(!useDefault)
-                {
-                TMTPPlaybackState state = static_cast<TMTPPlaybackState>(aCmd->ParamL().Uint32L());
-                val = map.PlaybackRateL(state);
-                }
-            iPropDesc->SetInt32L(CMTPTypeDevicePropDesc::ECurrentValue, val);
-            CleanupStack::PopAndDestroy(form);
-
-            SendDataL(*iPropDesc); 
-            }
-            break;
-        
-        case EMTPDevicePropCodePlaybackObject:
-            {
-            iPropDesc = CMTPTypeDevicePropDesc::NewL(propCode);
-            TUint32 val = 0;
-            property.GetDefaultPropertyValueL(propCode, val);
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, val);
-            CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap());
-            if(!useDefault)
-                {
-                val = map.ObjectHandleL(aCmd->ParamL().SuidSetL().Suid());                
-                }
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::ECurrentValue, val);
-            SendDataL(*iPropDesc); 
-            }
-            break;
-
-        case EMTPDevicePropCodePlaybackContainerIndex:
-            {
-            iPropDesc = CMTPTypeDevicePropDesc::NewL(propCode);
-            TUint32 val = 0;
-            property.GetDefaultPropertyValueL(propCode, val);
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, val);
-            if(!useDefault)
-                {
-                val = aCmd->ParamL().Uint32L();                
-                }
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::ECurrentValue, val);
-            SendDataL(*iPropDesc); 
-            }
-            break;
-
-        case EMTPDevicePropCodePlaybackPosition:
-            {
-            iPropDesc = CMTPTypeDevicePropDesc::NewL(propCode);
-            TUint32 val = 0;
-            CMTPPlaybackProperty& property(iPlaybackControlDp.GetPlaybackProperty());
-            property.GetDefaultPropertyValueL(propCode, val);
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, val);
-            if(!useDefault)
-                {
-                val = aCmd->ParamL().Uint32L();                
-                }
-            iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::ECurrentValue, val);
-            SendDataL(*iPropDesc);
-            }
-            break;
-        
-        default:
-            {
-            User::Leave(KErrArgument);
-            } 
-            break;
-        }
-
-    __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit"));
-    }