--- a/application/group/Podcast.mmp Thu Jul 22 16:33:34 2010 +0100
+++ b/application/group/Podcast.mmp Mon Jul 26 16:10:24 2010 +0100
@@ -15,12 +15,20 @@
* Description:
*
*/
+
+// MPX integration can not be enabled for self signed versions
+MACRO ENABLE_MPX_INTEGRATION
+#define ENABLE_MPX_INTEGRATION
TARGET Podcast.exe
TARGETTYPE exe
UID 0x100039CE 0xA0009D00
+#ifdef ENABLE_MPX_INTEGRATION
CAPABILITY NetworkServices UserEnvironment WriteUserData ReadDeviceData WriteDeviceData MultimediaDD
+#else
+CAPABILITY NetworkServices UserEnvironment
+#endif
EPOCSTACKSIZE 81920
EPOCHEAPSIZE 1024000 32768000
--- a/application/group/bld.inf Thu Jul 22 16:33:34 2010 +0100
+++ b/application/group/bld.inf Mon Jul 26 16:10:24 2010 +0100
@@ -52,3 +52,6 @@
-c16,1 Video_suspended.svg\
-c16,1 Feed
END
+
+PRJ_EXPORTS
+podcatcher.iby CORE_APP_LAYER_IBY_EXPORT_PATH(podcatcher.iby)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/group/podcatcher.iby Mon Jul 26 16:10:24 2010 +0100
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2007-2010 Sebastian Brannstrom, Lars Persson, EmbedDev AB
+ *
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of the License "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:
+ * Sebastian Brannstrom
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+#ifndef __PODCATCHER_IBY__
+#define __PODCATCHER_IBY__
+
+file=ABI_DIR\BUILD_DIR\podcast.exe sys\bin\podcast.ext
+file=ABI_DIR\BUILD_DIR\podcastengine.dll sys\bin\podcastengine.dll
+
+data=ZRESOURCE\apps\podcast.rsc resource\apps\podcast.rsc
+data=ZRESOURCE\apps\Podcast.mif resource\apps\Podcast.mif
+data=ZRESOURCE\help\podcatcher.hlp resource\apps\podcatcher.hlp
+
+data=ZPRIVATE\10003a3f\apps\podcast_reg.rsc private\10003a3f\apps\podcast_reg.rsc
+data=ZPRIVATE\A0009D00\backup_registration.xml private\A0009D00\backup_registration.xml
+data=ZPRIVATE\A0009D00\podcatcher.sqlite.template private\A0009D00\podcatcher.sqlite.template
+data=ZPRIVATE\A0009D00\defaultfeeds.xml private\A0009D00\defaultfeeds.xml
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/sis/make_s3_sis.cmd Mon Jul 26 16:10:24 2010 +0100
@@ -0,0 +1,6 @@
+del *.sis
+makesis -d\ podcatcher_udeb.pkg
+signsis podcatcher_udeb.sis podcatcher_udeb_signed.sis podcast.cer podcast.key
+
+makesis -d\ podcatcher_urel.pkg
+signsis podcatcher_urel.sis podcatcher_urel_signed.sis podcast.cer podcast.key
\ No newline at end of file
--- a/application/sis/make_s60_5th_sis.cmd Thu Jul 22 16:33:34 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-del *.sis
-makesis -dc:\symbian\S60_5th_Edition_SDK_v1.0 podcatcher_udeb.pkg
-signsis podcatcher_udeb.sis podcatcher_udeb_signed.sis podcast.cer podcast.key
-
-makesis -dc:\symbian\S60_5th_Edition_SDK_v1.0 podcatcher_urel.pkg
-signsis podcatcher_urel.sis podcatcher_urel_signed.sis podcast.cer podcast.key
\ No newline at end of file
--- a/application/sis/podcatcher_udeb.pkg Thu Jul 22 16:33:34 2010 +0100
+++ b/application/sis/podcatcher_udeb.pkg Mon Jul 26 16:10:24 2010 +0100
@@ -3,11 +3,8 @@
%{"Podcatcher"}
#{"Podcatcher"},(0xA0009D00), 1, 00, 0, TYPE=SA
-;Supports S60 3rd edition
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-;Supports Symbian^1
-[0x1028315F], 0, 0, 0, {"Series60ProductID"}
+;Supports Symbian^3
+[0x20022E6D], 0, 0, 0, {"Series60ProductID"}
; resources
"\epoc32\data\z\resource\apps\Podcast.RSC"-"!:\resource\apps\Podcast.rsc"
@@ -23,7 +20,7 @@
"./backup_registration.xml" - "c:\private\A0009D00\backup_registration.xml"
; app DLL
-;"\epoc32\release\gcce\udeb\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
+"\epoc32\release\gcce\udeb\podcastengine.dll"-"!:\sys\bin\podcastengine.dll"
; application UI - note that FR,RI does not work when SIS is self signed
"\epoc32\release\gcce\udeb\Podcast.exe"-"!:\sys\bin\Podcast.exe",FR,RI
Binary file application/sis/podcatcher_udeb.sis has changed
Binary file application/sis/podcatcher_udeb_signed.sis has changed
--- a/engine/group/engine.mmp Thu Jul 22 16:33:34 2010 +0100
+++ b/engine/group/engine.mmp Mon Jul 26 16:10:24 2010 +0100
@@ -16,6 +16,10 @@
*
*/
+// MPX integration can not be enabled for self signed versions
+MACRO ENABLE_MPX_INTEGRATION
+#define ENABLE_MPX_INTEGRATION
+
TARGET podcastengine.dll
TARGETTYPE DLL
UID 0x1000008d 0xA11F867F
@@ -67,8 +71,9 @@
LIBRARY imageconversion.lib
LIBRARY bitmaptransforms.lib
LIBRARY eikcore.lib
+#ifdef ENABLE_MPX_INTEGRATION
LIBRARY mpxcollectionhelper.lib
-LIBRARY apmime.lib // TDataType
+#endif
LIBRARY commonui.lib // CDocumentHandler
LIBRARY apparc.lib
LIBRARY avkon.lib
--- a/engine/inc/ShowEngine.h Thu Jul 22 16:33:34 2010 +0100
+++ b/engine/inc/ShowEngine.h Mon Jul 26 16:10:24 2010 +0100
@@ -28,17 +28,22 @@
#include "ShowEngineObserver.h"
#include "MetaDataReader.h"
#include <sqlite3.h>
+#ifdef ENABLE_MPX_INTEGRATION
#include "mpxcollectionhelper.h"
#include "mpxcollectionhelperobserver.h"
+#endif
struct TDownload
{
TUint iIndex;
TUint iUid;
};
-
+#ifdef ENABLE_MPX_INTEGRATION
class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver,
public MMPXCollectionHelperObserver
+#else
+class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver
+#endif
{
public:
IMPORT_C static CShowEngine* NewL(CPodcastModel& aPodcastModel);
@@ -156,8 +161,9 @@
sqlite3& iDB;
TBuf<KDefaultSQLDataBufferLength> iSqlBuffer;
-
+#ifdef ENABLE_MPX_INTEGRATION
MMPXCollectionHelper* iCollectionHelper;
+#endif
};
#endif /*SHOWENGINE_H_*/
--- a/engine/src/ShowEngine.cpp Thu Jul 22 16:33:34 2010 +0100
+++ b/engine/src/ShowEngine.cpp Mon Jul 26 16:10:24 2010 +0100
@@ -44,9 +44,10 @@
delete iShowDownloading;
delete iMetaDataReader;
iApaSession.Close();
-
+#ifdef ENABLE_MPX_INTEGRATION
if (iCollectionHelper)
delete iCollectionHelper;
+#endif
}
EXPORT_C CShowEngine* CShowEngine::NewL(CPodcastModel& aPodcastModel)
@@ -236,12 +237,13 @@
void CShowEngine::AddShowToMpxCollection(CShowInfo &aShowInfo)
{
+#ifdef ENABLE_MPX_INTEGRATION
if (!iCollectionHelper)
iCollectionHelper = CMPXCollectionHelperFactory::NewCollectionHelperL();
// if this leaves, not much we can do anyway
TRAP_IGNORE(iCollectionHelper->AddL(aShowInfo.FileName(), this));
-
+#endif
}
void CShowEngine::CompleteL(CHttpClient* /*aHttpClient*/, TInt aError)
--- a/group/bld.inf Thu Jul 22 16:33:34 2010 +0100
+++ b/group/bld.inf Mon Jul 26 16:10:24 2010 +0100
@@ -18,6 +18,3 @@
#include "..\engine\group\bld.inf"
#include "..\application\group\bld.inf"
-
-PRJ_EXPORTS
-podcatcher.iby CORE_APP_LAYER_IBY_EXPORT_PATH(podcatcher.iby)
\ No newline at end of file
--- a/group/podcatcher.iby Thu Jul 22 16:33:34 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2007-2010 Sebastian Brannstrom, Lars Persson, EmbedDev AB
- *
- * All rights reserved.
- * This component and the accompanying materials are made available
- * under the terms of the License "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:
- * Sebastian Brannstrom
- *
- * Contributors:
- *
- * Description:
- *
- */
-
-#ifndef __PODCATCHER_IBY__
-#define __PODCATCHER_IBY__
-
-file=ABI_DIR\BUILD_DIR\podcast.exe sys\bin\podcast.ext
-file=ABI_DIR\BUILD_DIR\podcastengine.dll sys\bin\podcastengine.dll
-
-data=ZRESOURCE\apps\podcast.rsc resource\apps\podcast.rsc
-data=ZRESOURCE\apps\Podcast.mif resource\apps\Podcast.mif
-data=ZRESOURCE\help\podcatcher.hlp resource\apps\podcatcher.hlp
-
-data=ZPRIVATE\10003a3f\apps\podcast_reg.rsc private\10003a3f\apps\podcast_reg.rsc
-data=ZPRIVATE\A0009D00\backup_registration.xml private\A0009D00\backup_registration.xml
-data=ZPRIVATE\A0009D00\podcatcher.sqlite.template private\A0009D00\podcatcher.sqlite.template
-data=ZPRIVATE\A0009D00\defaultfeeds.xml private\A0009D00\defaultfeeds.xml
-
-#endif