--- a/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -24,13 +24,9 @@
#include "../mtpdataproviders/mtppictbridgedp/pictbridgeengine/group/bld.inf"
#include "../mtpfws/mtpfw/group/bld.inf"
#include "../mtpdataproviders/mtpfileandfolderdp/group/bld.inf"
-#include "../mtpdataproviders/mtpwmpextndp/group/bld.inf"
#include "../mtptransports/mtpusbtransport/group/bld.inf"
//#include "../mtpfws/mtpfw/dataproviders/devdp/devdpextn/group/bld.inf"
#include "../mtptransports/mtpptpiptransport/group/bld.inf"
-#include "../mtptransports/mtpbttransport/group/bld.inf"
-#include "../mtpdataproviders/mtpmetadatadp/group/bld.inf"
-#include "../mtpdataproviders/mtpstatusdp/group/bld.inf"
#include "../mtpdataproviders/mtppictbridgedp/group/bld.inf"
#include "../mtpdataproviders/mtpimagedp/group/bld.inf"
--- a/mtpdataproviders/mtpfileandfolderdp/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpfileandfolderdp/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -24,7 +24,7 @@
PRJ_PLATFORMS
PRJ_EXPORTS
-mtp_filedp.iby /epoc32/rom/include/mtp_filedp.iby
+mtp_filedp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_filedp.iby)
../inc/mtpfiledp_config.rh SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(mtp/mtpfiledp_config.rh)
PRJ_MMPFILES
--- a/mtpdataproviders/mtpimagedp/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -32,7 +32,7 @@
// Note: these files are exported for testing and techview only. Not used in a device
2001fca2.txt /epoc32/data/z/private/10202be9/2001fca2.txt
-../group/mtp_imagedp.iby /epoc32/rom/include/mtp_imagedp.iby
+../group/mtp_imagedp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_imagedp.iby)
// ConfML files
../conf/mtp_imagedp.confml MW_LAYER_EXPORTS_CONFML(mtp_imagedp.confml)
--- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedp.h Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedp.h Thu Sep 02 21:21:26 2010 +0300
@@ -58,7 +58,7 @@
public:
CMTPImageDpObjectPropertyMgr& PropertyMgr()const;
- CMTPImageDpThumbnailCreator& ThumbnailManager() const;
+ CMTPImageDpThumbnailCreator* ThumbnailManager();
CRepository& Repository() const;
TMTPFormatCode FindFormat(const TDesC& aExtension);
--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp Thu Sep 02 21:21:26 2010 +0300
@@ -96,8 +96,6 @@
{
__FLOG_OPEN(KMTPSubsystem, KComponent);
__FLOG(_L8(">> CMTPImageDataProvider::ConstructL"));
-
- iThumbnailManager = CMTPImageDpThumbnailCreator::NewL(*this);
iNewPicNotifier = CMTPImageDpNewPicturesNotifier::NewL();
//Setup central repository connection
@@ -454,11 +452,14 @@
__FLOG(_L8("<< NotifyStorageEnumerationCompleteL"));
}
-CMTPImageDpThumbnailCreator& CMTPImageDataProvider::ThumbnailManager() const
- {
- __ASSERT_DEBUG(iThumbnailManager, User::Invariant());
- return *iThumbnailManager;
- }
+CMTPImageDpThumbnailCreator* CMTPImageDataProvider::ThumbnailManager()
+ {
+ if(NULL == iThumbnailManager)
+ {
+ TRAP_IGNORE(iThumbnailManager = CMTPImageDpThumbnailCreator::NewL(*this));
+ }
+ return iThumbnailManager;
+ }
CMTPImageDpObjectPropertyMgr& CMTPImageDataProvider::PropertyMgr()const
{
--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetthumb.cpp Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetthumb.cpp Thu Sep 02 21:21:26 2010 +0300
@@ -111,21 +111,26 @@
TEntry fileEntry;
User::LeaveIfError(iFramework.Fs().Entry(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), fileEntry));
- imgDp.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
- if(fileEntry.FileSize() > KFileSizeMax)
+
+ CMTPImageDpThumbnailCreator* tnc = imgDp.ThumbnailManager();
+ if(tnc != NULL)
{
- __FLOG(_L8(">> CMTPImageDpGetThumb::ServiceL, fileEntry.FileSize() > KFileSizeMax"));
- imgDp.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
+ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
+ if(fileEntry.FileSize() > KFileSizeMax)
+ {
+ __FLOG(_L8(">> CMTPImageDpGetThumb::ServiceL, fileEntry.FileSize() > KFileSizeMax"));
+ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
+ }
+
+ tnc->GetThumbnailL(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), thumbnailData, err);
+ imgDp.PropertyMgr().StoreThunmnail(iObjectMeta->Uint(CMTPObjectMetaData::EHandle), thumbnailData);
}
-
- imgDp.ThumbnailManager().GetThumbnailL(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), thumbnailData, err);
- User::LeaveIfError(err);
- User::LeaveIfNull(thumbnailData);
-
- //Transfer ownership of thumbnailData to Property Manager
- imgDp.PropertyMgr().StoreThunmnail(iObjectMeta->Uint(CMTPObjectMetaData::EHandle), thumbnailData);
+ //Transfer ownership of thumbnailData to Property Manager
}
- iThumb->Write(*thumbnailData);
+ if(thumbnailData != NULL)
+ {
+ iThumb->Write(*thumbnailData);
+ }
SendDataL(*iThumb);
__FLOG(_L8("<< CMTPImageDpGetThumb::ServiceL"));
}
--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp Thu Sep 02 21:21:26 2010 +0300
@@ -454,21 +454,23 @@
*/
TEntry fileEntry;
TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), fileEntry);
- if (err == KErrNone)
+ CMTPImageDpThumbnailCreator* tnc = iDataProvider.ThumbnailManager();
+ if (err == KErrNone && tnc != NULL)
{
+
if(fileEntry.FileSize() > KFileSizeMax || !alwaysCreate)
{
- iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
+ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
}
else
{
- iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
+ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
}
/**
* trap the leave to avoid return general error when PC get object property list
*/
- TRAP(err, iDataProvider.ThumbnailManager().GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
+ TRAP(err, tnc->GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
if (err == KErrNone)
{
iThumbnailCache.iObjectHandle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle);
@@ -484,6 +486,10 @@
}
}
}
+ else
+ {
+ aValue = KThumbCompressedSize;
+ }
}
break;
@@ -599,22 +605,23 @@
*/
TEntry fileEntry;
TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), fileEntry);
- if (err == KErrNone)
+ CMTPImageDpThumbnailCreator* tnc = iDataProvider.ThumbnailManager();
+ if (err == KErrNone && tnc != NULL)
{
if(fileEntry.FileSize() > KFileSizeMax || !alwaysCreate)
{
- iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
+ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate);
}
else
{
- iDataProvider.ThumbnailManager().GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
+ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags);
}
/**
* trap the leave to avoid return general error when PC get object property list
*/
- TRAP(err, iDataProvider.ThumbnailManager().GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
+ TRAP(err, tnc->GetThumbnailL(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), iThumbnailCache.iThumbnailData, err));
if (err == KErrNone)
{
iThumbnailCache.iObjectHandle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle);
--- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpthumbnailcreator.cpp Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpthumbnailcreator.cpp Thu Sep 02 21:21:26 2010 +0300
@@ -68,7 +68,7 @@
delete iBitmap;
delete iObjectSource;
delete iThumbMgr;
- if(iActiveSchedulerWait->IsStarted())
+ if(iActiveSchedulerWait != NULL && iActiveSchedulerWait->IsStarted())
{
*iCreationErr = KErrNotReady;
iActiveSchedulerWait->AsyncStop();
--- a/mtpdataproviders/mtppictbridgedp/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpdataproviders/mtppictbridgedp/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -24,9 +24,8 @@
PRJ_EXPORTS
-../inc/rptp.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(rptp.h)
-./mtppictbridgedp.iby /epoc32/rom/include/mtppictbridgedp.iby
-./rptp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(rptp.iby)
-
+../inc/rptp.h SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(rptp.h)
+./mtppictbridgedp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtppictbridgedp.iby)
+./rptp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(rptp.iby)
#endif
--- a/mtpfws/mtpfw/dataproviders/devdp/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpfws/mtpfw/dataproviders/devdp/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -32,7 +32,7 @@
mtpdevice.ico /epoc32/data/z/private/102827a2/mtpdevice.ico
../inc/mtpdevicedp_config.rh SYMBIAN_MW_LAYER_PLATFORM_EXPORT_PATH(mtp/mtpdevicedp_config.rh)
-mtp_devicedp.iby /epoc32/rom/include/mtp_devicedp.iby
+mtp_devicedp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_devicedp.iby)
PRJ_MMPFILES
mtpdevicedp.mmp
--- a/mtpfws/mtpfw/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtpfws/mtpfw/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -37,4 +37,4 @@
../conf/mtpframework.confml MW_LAYER_EXPORTS_CONFML(mtpframework.confml)
../conf/mtpframework_10282fcc.crml MW_LAYER_EXPORTS_CRML(mtpframework_10282fcc.crml)
-mtp_framework.iby /epoc32/rom/include/mtp_framework.iby
+mtp_framework.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_framework.iby)
--- a/mtptransports/mtpcontroller/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtptransports/mtpcontroller/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -24,7 +24,7 @@
ARMV5
PRJ_EXPORTS
-mtp_controller.iby /epoc32/rom/include/mtp_controller.iby
+mtp_controller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_controller.iby)
PRJ_MMPFILES
mtpcontroller.mmp
--- a/mtptransports/mtpusbtransport/group/bld.inf Wed Aug 18 10:38:51 2010 +0300
+++ b/mtptransports/mtpusbtransport/group/bld.inf Thu Sep 02 21:21:26 2010 +0300
@@ -28,5 +28,5 @@
#include "../usbsic_cc/group/bld.inf"
PRJ_EXPORTS
-mtp_usbsic.iby /epoc32/rom/include/mtp_usbsic.iby
+mtp_usbsic.iby CORE_MW_LAYER_IBY_EXPORT_PATH(mtp_usbsic.iby)
--- a/package_definition.xml Wed Aug 18 10:38:51 2010 +0300
+++ b/package_definition.xml Thu Sep 02 21:21:26 2010 +0300
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0">
<package id="remoteconn" name="Remote Connectivity" levels="plugin framework server generic specific">
- <collection id="remoteconn_info" name="Remote Connectivity Info" level="specific">
- <component id="remoteconn_metadata" name="Remote Connectivity Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="remoteconn_info/remoteconn_metadata/remoteconn_metadata.mrp"/>
- </component>
- </collection>
<collection id="remoteconn_plat" name="Remote Connectivity Platform Interfaces" level="specific">
<component id="dialup_connection_status_api" name="Dialup Connection Status API" class="api" filter="s60">
<meta rel="Api" href="remoteconn_plat/dialup_connection_status_api/dialup_connection_status_api.metaxml"/>