# HG changeset patch
# User teknolog
# Date 1273755365 -3600
# Node ID c2f1ea38ec70cf3abe73d5f560679839a303a7ee
# Parent 70749e2f572d55912e61b0698c1330d3e9d560f5
Import from FCL default branch
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/PodcastClient_english.rls
--- a/application/data/PodcastClient_english.rls Thu Apr 29 11:55:32 2010 +0100
+++ b/application/data/PodcastClient_english.rls Thu May 13 13:56:05 2010 +0100
@@ -73,10 +73,6 @@
rls_string STRING_podcast_autoupdate_option4 "Twice a day"
rls_string STRING_podcast_autoupdate_option5 "Daily"
-// Auto download settings
-rls_string STRING_r_on "On"
-rls_string STRING_r_off "Off"
-
// Feed import/export
rls_string STRING_r_view_import_feeds_title "Select OPML file"
rls_string STRING_r_enter_filename "Enter file name"
@@ -149,7 +145,7 @@
rls_string STRING_r_view_remove_download_cmd "Remove download"
rls_string STRING_r_error_notfound "Error: Not found on server"
-rls_string STRING_r_error_invalid_address "Error: Invalid address"
+rls_string STRING_r_error_invalid_address "Error: Connection failed"
rls_string STRING_r_error_general "Error: General error %d"
rls_string STRING_r_error_http "Error: HTTP error %d"
rls_string STRING_r_error_disk_full "Error: Disk full"
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/PodcastQueueView.ra
--- a/application/data/PodcastQueueView.ra Thu Apr 29 11:55:32 2010 +0100
+++ b/application/data/PodcastQueueView.ra Thu May 13 13:56:05 2010 +0100
@@ -95,26 +95,6 @@
};
};
},
-#ifdef SYMBIAN1_UI
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastRemoveDownload;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_remove_download_short_cmd;
- helptxt = STRING_r_view_remove_download_cmd;
- }
- };
- };
- },
-#endif
TBAR_CTRL
{
type = EAknCtButton;
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/PodcastShowsView.ra
--- a/application/data/PodcastShowsView.ra Thu Apr 29 11:55:32 2010 +0100
+++ b/application/data/PodcastShowsView.ra Thu May 13 13:56:05 2010 +0100
@@ -119,63 +119,6 @@
};
};
}
-#ifdef SYMBIAN1_UI
- ,
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastDeleteShow;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_delete_show_cmd;
- helptxt = STRING_r_view_delete_show_cmd;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id = EPodcastMarkAsPlayed;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_mark_as_played_cmd_short;
- helptxt = STRING_r_view_mark_as_played_cmd_short;
- }
- };
- };
- },
- TBAR_CTRL
- {
- type = EAknCtButton;
- id =EPodcastMarkAsUnplayed;
- control = AVKON_BUTTON
- {
- states =
- {
- AVKON_BUTTON_STATE
- {
- //bmpfile = AVKON_BITMAP_FILE;
- //bmpid = EMbmAvkonQgn_indi_find_goto;
- txt = STRING_r_view_mark_as_unplayed_cmd_short;
- helptxt = STRING_r_view_mark_as_unplayed_cmd_short;
- }
- };
- };
- }
-#endif
};
}
@@ -188,7 +131,6 @@
txt = STRING_r_view_show_info_cmd;
command = EPodcastShowInfo;
}
-#ifndef SYMBIAN1_UI
,STYLUS_POPUP_MENU_ITEM
{
txt = STRING_r_view_mark_as_unplayed_cmd_short;
@@ -209,7 +151,6 @@
txt = STRING_r_view_delete_show_cmd;
command = EPodcastDeleteShow;
}
-#endif
};
}
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,23 @@
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_downloaded.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_downloaded.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,39 @@
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_downloaded_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_downloaded_new.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,54 @@
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_downloading.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_downloading.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,86 @@
+
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_failed.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_failed.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,33 @@
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_new.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,39 @@
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_queued.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_queued.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,94 @@
+
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Audio_suspended.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Audio_suspended.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,75 @@
+
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Feed.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Feed.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,1574 @@
+
+
+
+
+
+
+
+
+
+
+]>
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,127 @@
+
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_downloaded.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_downloaded.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,193 @@
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_downloaded_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_downloaded_new.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,230 @@
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_downloading.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_downloading.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,169 @@
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_failed.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_failed.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,182 @@
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_new.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_new.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,193 @@
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_queued.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_queued.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,149 @@
+
+
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/Video_suspended.svg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/data/images/Video_suspended.svg Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,167 @@
+
+
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio.svg
--- a/application/data/images/new/Audio.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_downloaded.svg
--- a/application/data/images/new/Audio_downloaded.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_downloaded_new.svg
--- a/application/data/images/new/Audio_downloaded_new.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_downloading.svg
--- a/application/data/images/new/Audio_downloading.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_failed.svg
--- a/application/data/images/new/Audio_failed.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_new.svg
--- a/application/data/images/new/Audio_new.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_queued.svg
--- a/application/data/images/new/Audio_queued.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Audio_suspended.svg
--- a/application/data/images/new/Audio_suspended.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Feed.svg
--- a/application/data/images/new/Feed.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1574 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-]>
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video.svg
--- a/application/data/images/new/Video.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_downloaded.svg
--- a/application/data/images/new/Video_downloaded.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_downloaded_new.svg
--- a/application/data/images/new/Video_downloaded_new.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_downloading.svg
--- a/application/data/images/new/Video_downloading.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_failed.svg
--- a/application/data/images/new/Video_failed.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_new.svg
--- a/application/data/images/new/Video_new.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_queued.svg
--- a/application/data/images/new/Video_queued.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-
-
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/data/images/new/Video_suspended.svg
--- a/application/data/images/new/Video_suspended.svg Thu Apr 29 11:55:32 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-
-
diff -r 70749e2f572d -r c2f1ea38ec70 application/group/Podcast.mmp
--- a/application/group/Podcast.mmp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/group/Podcast.mmp Thu May 13 13:56:05 2010 +0100
@@ -16,8 +16,6 @@
*
*/
-MACRO SYMBIAN1_UI
-
TARGET Podcast.exe
TARGETTYPE exe
UID 0x100039CE 0xA0009D00
@@ -29,15 +27,10 @@
SYSTEMINCLUDE \epoc32\include
SYSTEMINCLUDE \epoc32\include\mmf\common
-SYSTEMINCLUDE \epoc32\include\domain\middleware
SYSTEMINCLUDE \epoc32\include\mw // for Symbian^3
SYSTEMINCLUDE \epoc32\include\platform\mw // for Symbian^3
-
-#ifdef SQLITE_INCLUDED
-SYSTEMINCLUDE ..\..\engine\sqlite\inc
-#else
+SYSTEMINCLUDE \epoc32\include\platform
SYSTEMINCLUDE \epoc32\include\stdapis
-#endif
USERINCLUDE ..\..\engine\inc
USERINCLUDE .
@@ -74,25 +67,8 @@
#endif
END
-#ifdef SQLITE_INCLUDED
-STATICLIBRARY PodCastEngine.lib
-STATICLIBRARY sqlite_podcatcher.lib
-LIBRARY mediaclientaudio.lib
-LIBRARY inetprotutil.lib
-LIBRARY xmlframework.lib
-LIBRARY http.lib
-LIBRARY ezlib.lib
-LIBRARY commdb.lib
-LIBRARY esock.lib
-LIBRARY mmfcontrollerframework.lib
-LIBRARY cmmanager.lib
-LIBRARY libc.lib
-LIBRARY imageconversion.lib
-LIBRARY bitmaptransforms.lib
-#else
LIBRARY PodCastEngine.lib
LIBRARY sqlite3.lib
-#endif
LIBRARY euser.lib
LIBRARY apparc.lib
LIBRARY cone.lib
@@ -121,3 +97,4 @@
LIBRARY ws32.lib
LIBRARY hlplch.lib
LIBRARY bitgdi.lib
+LIBRARY cmmanager.lib
diff -r 70749e2f572d -r c2f1ea38ec70 application/group/bld.inf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/application/group/bld.inf Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,54 @@
+/*
+ * 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:
+ * EmbedDev AB - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_MMPFILES
+
+Podcast.mmp
+
+PRJ_EXPORTS
+..\help\podcatcher.hlp z:\resource\help\podcatcher.hlp
+
+PRJ_EXTENSIONS
+
+START EXTENSION s60/mifconv
+OPTION TARGETFILE Podcast.mif
+OPTION HEADERFILE Podcast.mbg
+OPTION SOURCEDIR ../data/images
+OPTION SOURCES \
+ -c16,1 podcatcher_64px\
+ -c16,1 Audio\
+ -c16,1 Audio_new\
+ -c16,1 Audio_queued\
+ -c16,1 Audio_downloading\
+ -c16,1 Audio_downloaded\
+ -c16,1 Audio_downloaded_new\
+ -c16,1 Audio_failed\
+ -c16,1 Audio_suspended\
+ -c16,1 Video.svg\
+ -c16,1 Video_new.svg\
+ -c16,1 Video_queued.svg\
+ -c16,1 Video_downloading.svg\
+ -c16,1 Video_downloaded.svg\
+ -c16,1 Video_downloaded_new.svg\
+ -c16,1 Video_failed.svg\
+ -c16,1 Video_suspended.svg\
+ -c16,1 Feed
+END
diff -r 70749e2f572d -r c2f1ea38ec70 application/src/PodcastFeedView.cpp
--- a/application/src/PodcastFeedView.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastFeedView.cpp Thu May 13 13:56:05 2010 +0100
@@ -37,11 +37,11 @@
const TInt KMaxFeedNameLength = 100;
const TInt KMaxUnplayedFeedsLength =64;
const TInt KADayInHours = 24;
-const TInt KDefaultGran = 5;
-const TInt KNumberOfFilesMaxLength = 4;
+//const TInt KDefaultGran = 5;
+//const TInt KNumberOfFilesMaxLength = 4;
#define KMaxMessageLength 200
#define KMaxTitleLength 100
-const TInt KMimeBufLength = 100;
+//const TInt KMimeBufLength = 100;
_LIT(KFeedFormat, "%d\t%S\t%S%S");
enum
@@ -203,9 +203,7 @@
switch(aEventType)
{
-#ifndef SYMBIAN1_UI
case EEventItemClicked:
-#endif
case EEventEnterKeyPressed:
case EEventItemDoubleClicked:
case EEventItemActioned:
diff -r 70749e2f572d -r c2f1ea38ec70 application/src/PodcastListView.cpp
--- a/application/src/PodcastListView.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastListView.cpp Thu May 13 13:56:05 2010 +0100
@@ -75,12 +75,6 @@
iListbox->MakeVisible(ETrue);
MakeVisible(EFalse);
-//#ifndef SYMBIAN1_UI
-// TInt flags = iListbox->View()->ItemDrawer()->Flags();
-// flags |= CListItemDrawer::EDisableHighlight;
-// iListbox->ItemDrawer()->SetFlags(flags);
-//#endif
-
// Activate the window, which makes it ready to be drawn
ActivateL();
}
diff -r 70749e2f572d -r c2f1ea38ec70 application/src/PodcastQueueView.cpp
--- a/application/src/PodcastQueueView.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastQueueView.cpp Thu May 13 13:56:05 2010 +0100
@@ -69,13 +69,12 @@
// no popup options apply to S^1
-#ifndef SYMBIAN1_UI
iStylusPopupMenu = CAknStylusPopUpMenu::NewL( this , TPoint(0,0));
TResourceReader reader;
iCoeEnv->CreateResourceReaderLC(reader,R_QUEUEVIEW_POPUP_MENU);
iStylusPopupMenu->ConstructFromResourceL(reader);
CleanupStack::PopAndDestroy();
-#endif
+
SetEmptyTextL(R_PODCAST_EMPTY_QUEUE);
}
@@ -145,9 +144,7 @@
{
switch (aEventType)
{
-#ifndef SYMBIAN1_UI
case EEventItemClicked:
-#endif
case EEventEnterKeyPressed:
case EEventItemActioned:
case EEventItemDoubleClicked:
diff -r 70749e2f572d -r c2f1ea38ec70 application/src/PodcastSearchView.cpp
--- a/application/src/PodcastSearchView.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastSearchView.cpp Thu May 13 13:56:05 2010 +0100
@@ -39,13 +39,13 @@
#include
const TInt KMaxFeedNameLength = 100;
-const TInt KDefaultGran = 5;
-const TInt KNumberOfFilesMaxLength = 4;
+//const TInt KDefaultGran = 5;
+//const TInt KNumberOfFilesMaxLength = 4;
#define KMaxMessageLength 200
#define KMaxTitleLength 100
-const TInt KMimeBufLength = 100;
+//const TInt KMimeBufLength = 100;
-_LIT(KUnknownUpdateDateString, "?/?");
+//_LIT(KUnknownUpdateDateString, "?/?");
_LIT(KSearchResultFormat, "%d\t%S\t%S");
CPodcastSearchView* CPodcastSearchView::NewL(CPodcastModel& aPodcastModel)
diff -r 70749e2f572d -r c2f1ea38ec70 application/src/PodcastSettingsView.cpp
--- a/application/src/PodcastSettingsView.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastSettingsView.cpp Thu May 13 13:56:05 2010 +0100
@@ -381,32 +381,26 @@
case EPodcastSettingShowDir:
DP("EPodcastSettingShowDir");
return new (ELeave) CAknTextSettingItem(aSettingId, iShowDir);
- break;
case EPodcastSettingAutoUpdate:
DP("EPodcastSettingAutoUpdate");
iSettingAutoUpdate = new (ELeave) CAknEnumeratedTextPopupSettingItem(aSettingId, iAutoUpdate);
return iSettingAutoUpdate;
- break;
case EPodcastSettingConnection:
DP("EPodcastSettingConnection");
return new (ELeave) CConnectionSetting (aSettingId, iConnection, iPodcastModel);
- break;
case EPodcastSettingIAPList:
DP("EPodcastSettingIAPList");
iSettingIAP = new (ELeave) CIapSetting (aSettingId, iIap, iPodcastModel);
return iSettingIAP;
- break;
case EPodcastSettingAutoDownload:
DP("EPodcastSettingAutoDownload");
iSettingAutoDownload = new (ELeave) CAknBinaryPopupSettingItem (aSettingId, iAutoDownload);
return iSettingAutoDownload;
- break;
default:
return CAknSettingItemList::CreateSettingItemL(aSettingId);
- break;
}
- DP("CreateSettingItemL END");
- return NULL;
+ //DP("CreateSettingItemL END");
+ //return NULL;
}
TFileName iShowDir;
@@ -543,6 +537,7 @@
}
break;
case EPodcastResetDb:
+ {
CAknQueryDialog* dlg= new(ELeave) CAknQueryDialog();
CleanupStack::PushL(dlg);
@@ -555,9 +550,12 @@
iPodcastModel.DropDB();
AppUi()->Exit();
}
+ }
break;
default:
+ {
AppUi()->HandleCommandL(aCommand);
+ }
break;
}
}
diff -r 70749e2f572d -r c2f1ea38ec70 application/src/PodcastShowsView.cpp
--- a/application/src/PodcastShowsView.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/application/src/PodcastShowsView.cpp Thu May 13 13:56:05 2010 +0100
@@ -38,8 +38,8 @@
_LIT(KShowsSizeFormatS60, "%.1f MB");
_LIT(KShowFormat, "%d\t%S\t%S%S\t");
-_LIT(KShowErrorFormat, "%d\t%S\t%S\t");
-_LIT(KShowQueueFormat, "%d\t%S\t%S%S\t");
+//_LIT(KShowErrorFormat, "%d\t%S\t%S\t");
+//_LIT(KShowQueueFormat, "%d\t%S\t%S%S\t");
// these must correspond with TShowsIconIndex
@@ -315,9 +315,7 @@
{
switch (aEventType)
{
-#ifndef SYMBIAN1_UI
case EEventItemClicked:
-#endif
case EEventEnterKeyPressed:
case EEventItemActioned:
case EEventItemDoubleClicked:
@@ -670,68 +668,10 @@
toolbar->HideItem(EPodcastUpdateFeed, updatingState, ETrue );
toolbar->HideItem(EPodcastCancelUpdateAllFeeds, !updatingState, ETrue );
-#ifndef SYMBIAN1_UI
// there seems to be drawing bugs in the toolbar if there is only
// one or two buttons defined in the resource, so we have download
// there but always hidden
toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue );
-#else SYMBIAN1_UI
- RShowInfoArray &fItems = iPodcastModel.ActiveShowList();
- TInt itemCnt = fItems.Count();
-
- TBool hideDownloadShowCmd = EFalse;
- TBool dimDownloadShowCmd = EFalse;
- TBool hideSetPlayed = EFalse;
-
- if(iListContainer->Listbox() != NULL)
- {
- TInt index = iListContainer->Listbox()->CurrentItemIndex();
-
- if(index>= 0 && index < itemCnt)
- {
- switch(fItems[index]->DownloadState())
- {
- case ENotDownloaded:
- case EFailedDownload:
- hideDownloadShowCmd = EFalse;
- dimDownloadShowCmd = EFalse;
- break;
- case EQueued:
- case EDownloading:
- hideDownloadShowCmd = EFalse;
- dimDownloadShowCmd = ETrue;
- break;
- case EDownloaded:
- hideDownloadShowCmd = ETrue;
- break;
- }
-
- if(fItems[index]->PlayState() == EPlayed) {
- hideSetPlayed = ETrue;
- }
- }
- }
-
- if (hideDownloadShowCmd) {
- toolbar->HideItem(EPodcastDownloadShow, ETrue, ETrue );
- toolbar->HideItem(EPodcastDeleteShow, EFalse, ETrue);
- toolbar->SetItemDimmed(EPodcastDeleteShow, updatingState, ETrue);
- } else {
- toolbar->HideItem(EPodcastDownloadShow, EFalse, ETrue );
- toolbar->HideItem(EPodcastDeleteShow, ETrue, ETrue);
- toolbar->SetItemDimmed(EPodcastDownloadShow, updatingState || dimDownloadShowCmd, ETrue);
- }
-
- if (hideSetPlayed) {
- toolbar->HideItem(EPodcastMarkAsPlayed, ETrue, ETrue );
- toolbar->HideItem(EPodcastMarkAsUnplayed, EFalse, ETrue );
- toolbar->SetItemDimmed(EPodcastMarkAsUnplayed, updatingState, ETrue);
- } else {
- toolbar->HideItem(EPodcastMarkAsPlayed, EFalse, ETrue );
- toolbar->HideItem(EPodcastMarkAsUnplayed, ETrue, ETrue );
- toolbar->SetItemDimmed(EPodcastMarkAsPlayed, updatingState, ETrue);
- }
-#endif
}
}
diff -r 70749e2f572d -r c2f1ea38ec70 engine/BWINS/podcastengineu.def
--- a/engine/BWINS/podcastengineu.def Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/BWINS/podcastengineu.def Thu May 13 13:56:05 2010 +0100
@@ -161,4 +161,6 @@
?Url@CShowInfo@@QBEABVTDesC16@@XZ @ 160 NONAME ; class TDesC16 const & CShowInfo::Url(void) const
?XMLEncode@PodcastUtils@@SAXAAVTDes16@@@Z @ 161 NONAME ; void PodcastUtils::XMLEncode(class TDes16 &)
?DropDB@CPodcastModel@@QAEXXZ @ 162 NONAME ; void CPodcastModel::DropDB(void)
+ ?CheckForDeletedShows@CShowEngine@@QAEXI@Z @ 163 NONAME ; void CShowEngine::CheckForDeletedShows(unsigned int)
+ ?IsVideoShow@PodcastUtils@@SAHAAVTDesC16@@@Z @ 164 NONAME ; int PodcastUtils::IsVideoShow(class TDesC16 &)
diff -r 70749e2f572d -r c2f1ea38ec70 engine/eabi/podcastengineu.def
--- a/engine/eabi/podcastengineu.def Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/eabi/podcastengineu.def Thu May 13 13:56:05 2010 +0100
@@ -197,4 +197,6 @@
_ZTV17CHttpEventHandler @ 196 NONAME
_ZTV9CFeedInfo @ 197 NONAME
_ZTV9CShowInfo @ 198 NONAME
+ _ZN11CShowEngine20CheckForDeletedShowsEj @ 199 NONAME
+ _ZN12PodcastUtils11IsVideoShowER7TDesC16 @ 200 NONAME
diff -r 70749e2f572d -r c2f1ea38ec70 engine/group/bld.inf
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/engine/group/bld.inf Thu May 13 13:56:05 2010 +0100
@@ -0,0 +1,31 @@
+/*
+ * 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:
+ * EmbedDev AB - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ */
+
+PRJ_PLATFORMS
+GCCE
+WINSCW
+
+PRJ_MMPFILES
+
+PRJ_MMPFILES
+engine.mmp
+
+PRJ_EXPORTS
+..\config\podcatcher.sqlite z:\private\A0009D00\podcatcher.sqlite.template
+..\config\defaultfeeds.xml z:\private\A0009D00\defaultfeeds.xml
+..\config\testfeeds.xml c:\data\testfeeds.xml
\ No newline at end of file
diff -r 70749e2f572d -r c2f1ea38ec70 engine/group/engine.mmp
--- a/engine/group/engine.mmp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/group/engine.mmp Thu May 13 13:56:05 2010 +0100
@@ -16,28 +16,18 @@
*
*/
-#ifdef SQLITE_INCLUDED
-// must build a .lib since sqlite uses "initialized writable data"
-TARGET podcastengine.lib
-TARGETTYPE LIB
-#else
TARGET podcastengine.dll
TARGETTYPE DLL
UID 0x1000008d 0xA11F867F
-#endif
SOURCEPATH ..\src
USERINCLUDE ..\inc
SYSTEMINCLUDE \epoc32\include
-SYSTEMINCLUDE \epoc32\include\mw // needed for S^3
+SYSTEMINCLUDE \epoc32\include\mw
+SYSTEMINCLUDE \epoc32\include\platform
+SYSTEMINCLUDE \epoc32\include\platform\mw
+SYSTEMINCLUDE \epoc32\include\stdapis
-#ifdef SQLITE_INCLUDED
-SYSTEMINCLUDE ..\..\engine\sqlite\inc
-#else
-SYSTEMINCLUDE \epoc32\include\stdapis
-#endif
-
-// Engine
SOURCE HttpClient.cpp
SOURCE HttpEventHandler.cpp
SOURCE FeedParser.cpp
@@ -53,12 +43,8 @@
SOURCE PodCastModel.cpp
SOURCE ImageHandler.cpp
SOURCE ConnectionEngine.cpp
-CAPABILITY NetworkServices UserEnvironment
-#ifndef SQLITE_INCLUDED
LIBRARY sqlite3.lib
-#endif
-
LIBRARY euser.lib
LIBRARY bafl.lib
LIBRARY efsrv.lib
@@ -81,4 +67,6 @@
LIBRARY imageconversion.lib
LIBRARY bitmaptransforms.lib
LIBRARY eikcore.lib
-//staticlibrary sqlite_podcatcher.lib
\ No newline at end of file
+LIBRARY mpxcollectionhelper.lib
+
+CAPABILITY NetworkServices UserEnvironment
diff -r 70749e2f572d -r c2f1ea38ec70 engine/inc/FeedEngine.h
--- a/engine/inc/FeedEngine.h Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/inc/FeedEngine.h Thu May 13 13:56:05 2010 +0100
@@ -151,8 +151,9 @@
// observers that will receive callbacks, not owning
RArray iObservers;
- TBool iCatchupMode;
- TUint iCatchupCounter;
+ // new feeds only add one show to download list when auto downloading
+ TBool newFeed;
+ TUint showsAdded;
sqlite3& iDB;
diff -r 70749e2f572d -r c2f1ea38ec70 engine/inc/ShowEngine.h
--- a/engine/inc/ShowEngine.h Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/inc/ShowEngine.h Thu May 13 13:56:05 2010 +0100
@@ -28,8 +28,11 @@
#include "ShowEngineObserver.h"
#include "MetaDataReader.h"
#include
+#include "mpxcollectionhelper.h"
+#include "mpxcollectionhelperobserver.h"
-class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver
+class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver,
+ public MMPXCollectionHelperObserver
{
public:
IMPORT_C static CShowEngine* NewL(CPodcastModel& aPodcastModel);
@@ -84,7 +87,9 @@
// from MetaDataReaderObserver
void ReadMetaDataL(CShowInfo& aShowInfo);
void ReadMetaDataCompleteL();
-
+ // from MMPXCollectionHelperObserver
+ void HandleAddFileCompleteL( TInt /*aErr*/ ) {}
+
private:
CShowEngine(CPodcastModel& aPodcastModel);
void ConstructL();
@@ -142,6 +147,8 @@
sqlite3& iDB;
TBuf iSqlBuffer;
+
+ MMPXCollectionHelper* iCollectionHelper;
};
#endif /*SHOWENGINE_H_*/
diff -r 70749e2f572d -r c2f1ea38ec70 engine/src/FeedEngine.cpp
--- a/engine/src/FeedEngine.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/src/FeedEngine.cpp Thu May 13 13:56:05 2010 +0100
@@ -144,6 +144,11 @@
EXPORT_C void CFeedEngine::UpdateAllFeedsL(TBool aAutoUpdate)
{
+ if (iClientState != EIdle)
+ {
+ User::Leave(KErrInUse);
+ }
+
iAutoUpdatedInitiator = aAutoUpdate;
if (iFeedsUpdating.Count() > 0)
{
@@ -176,6 +181,11 @@
{
DP1("UpdateNextFeed. %d feeds left to update", iFeedsUpdating.Count());
+ if (iClientState != EIdle)
+ {
+ User::Leave(KErrInUse);
+ }
+
// reset active feed, will be set again in UpdateFeedL if needed
iActiveFeed = NULL;
@@ -229,10 +239,11 @@
if (iActiveFeed->LastUpdated() == 0)
{
- iCatchupMode = ETrue;
- iCatchupCounter = 0;
+ newFeed = ETrue;
}
+ showsAdded = 0;
+
iActiveFeed->SetLastError(KErrNone);
DBUpdateFeedL(*iActiveFeed);
@@ -273,10 +284,12 @@
aItem.SetDescriptionL(*description);
CleanupStack::PopAndDestroy(description);
- if (iCatchupMode) {
- // in catchup mode, we let one show be unplayed
- if (++iCatchupCounter > 1) {
- aItem.SetPlayState(EPlayed);
+ if (newFeed) {
+ // for new feeds, set all shows played
+ aItem.SetPlayState(EPlayed);
+ // except the first one
+ if (showsAdded == 0) {
+ aItem.SetPlayState(ENeverPlayed);
}
}
@@ -286,7 +299,9 @@
iPodcastModel.SettingsEngine().DownloadAutomatically())
{
iPodcastModel.ShowEngine().AddDownloadL(aItem);
- }
+ }
+
+ showsAdded++;
}
void CFeedEngine::GetFeedImageL(CFeedInfo *aFeedInfo)
@@ -577,11 +592,7 @@
iActiveFeed->SetLastError(parserErr);
DP1("CFeedEngine::Complete()\t Failed to parse feed. Leave with error code=%d", parserErr);
}
- else
- {
- iPodcastModel.ShowEngine().DeleteOldShowsByFeedL(iActiveFeed->Uid());
- }
-
+
// delete the downloaded XML file as it is no longer needed
BaflUtils::DeleteFile(iPodcastModel.FsSession(),iUpdatingFeedFileName);
diff -r 70749e2f572d -r c2f1ea38ec70 engine/src/FeedParser.cpp
--- a/engine/src/FeedParser.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/src/FeedParser.cpp Thu May 13 13:56:05 2010 +0100
@@ -281,8 +281,8 @@
iActiveShow = NULL;
iItemsParsed++;
- //DP2("iItemsParsed: %d, iMaxItems: %d", iItemsParsed, iMaxItems);
- if (iItemsParsed > iMaxItems)
+ DP2("iItemsParsed: %d, iMaxItems: %d", iItemsParsed, iMaxItems);
+ if (iItemsParsed >= iMaxItems)
{
iStoppedParsing = ETrue;
DP("*** Too many items, aborting parsing");
diff -r 70749e2f572d -r c2f1ea38ec70 engine/src/HttpClient.cpp
--- a/engine/src/HttpClient.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/src/HttpClient.cpp Thu May 13 13:56:05 2010 +0100
@@ -192,8 +192,12 @@
TBool CHttpClient::GetL(const TDesC& aUrl, const TDesC& aFileName, TBool aSilent) {
DP("CHttpClient::Get START");
- DP2("Getting '%S' to '%S'", &aUrl, &aFileName);
- __ASSERT_DEBUG((iIsActive==EFalse), Panic(EPodcatcherPanicAlreadyActive));
+ DP2("Getting '%S' to '%S'", &aUrl, &aFileName);
+
+ if (iIsActive)
+ {
+ return EFalse;
+ }
iCurrentURL.Copy(aUrl);
TInt urlError = iUriParser.Parse(iCurrentURL);
diff -r 70749e2f572d -r c2f1ea38ec70 engine/src/HttpEventHandler.cpp
--- a/engine/src/HttpEventHandler.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/src/HttpEventHandler.cpp Thu May 13 13:56:05 2010 +0100
@@ -193,12 +193,14 @@
case THTTPEvent::ESucceeded:
{
DP("Transaction Successful");
+ iRespBodyFile.Close();
aTransaction.Close();
iHttpClient->ClientRequestCompleteL(KErrNone);
} break;
case THTTPEvent::EFailed:
{
DP("Transaction Failed");
+ iRespBodyFile.Close();
aTransaction.Close();
if(iLastStatusCode == HTTPStatus::EOk || iLastStatusCode == HTTPStatus::ECreated || iLastStatusCode == HTTPStatus::EAccepted)
@@ -222,6 +224,7 @@
// close off the transaction if it's an error
if (aEvent.iStatus < 0)
{
+ iRespBodyFile.Close();
aTransaction.Close();
iHttpClient->ClientRequestCompleteL(aEvent.iStatus);
}
diff -r 70749e2f572d -r c2f1ea38ec70 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/src/PodcastModel.cpp Thu May 13 13:56:05 2010 +0100
@@ -72,21 +72,25 @@
{
DP("CPodcastModel::ConstructL BEGIN");
User::LeaveIfError(iFsSession.Connect());
-
iCommDB = CCommsDatabase::NewL (EDatabaseTypeUnspecified);
- //iCommDB ->ShowHiddenRecords(); // magic
iIapNameArray = new (ELeave) CDesCArrayFlat(KDefaultGranu);
iSNAPNameArray = new (ELeave) CDesCArrayFlat(KDefaultGranu);
- iCmManager.OpenL();
+
iImageHandler = CImageHandler::NewL(FsSession(), *this);
+
+ TRAPD(err,iCmManager.OpenL());
+ DP1("iCmManager.OpenL(),err=%d;", err);
- UpdateIAPListL();
- UpdateSNAPListL();
+ if (err == KErrNone)
+ {
+ UpdateIAPListL();
+ UpdateSNAPListL();
+ }
iSettingsEngine = CSettingsEngine::NewL(*this);
iConnectionEngine = CConnectionEngine::NewL(*this);
- TRAPD(err, OpenDBL());
+ TRAP(err, OpenDBL());
if (err != KErrNone)
{
@@ -435,6 +439,7 @@
EXPORT_C void CPodcastModel::GetShowsByFeedL(TUint aFeedUid)
{
iActiveShowList.ResetAndDestroy();
+ iShowEngine->DeleteOldShowsByFeedL(aFeedUid);
iShowEngine->CheckForDeletedShows(aFeedUid);
iShowEngine->GetShowsByFeedL(iActiveShowList, aFeedUid);
}
diff -r 70749e2f572d -r c2f1ea38ec70 engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp Thu Apr 29 11:55:32 2010 +0100
+++ b/engine/src/ShowEngine.cpp Thu May 13 13:56:05 2010 +0100
@@ -26,10 +26,7 @@
#include
#include "debug.h"
#include "PodcastUtils.h"
-
-//#include
-//#include
-//#include
+#include
const TUint KMaxDownloadErrors = 3;
const TInt KMimeBufLength = 100;
@@ -47,6 +44,9 @@
delete iShowDownloading;
delete iMetaDataReader;
iApaSession.Close();
+
+ if (iCollectionHelper)
+ delete iCollectionHelper;
}
EXPORT_C CShowEngine* CShowEngine::NewL(CPodcastModel& aPodcastModel)
@@ -239,15 +239,14 @@
}
}
-void CShowEngine::AddShowToMpxCollection(CShowInfo &/*aShowInfo*/)
+void CShowEngine::AddShowToMpxCollection(CShowInfo &aShowInfo)
{
-/* RArray contentIDs;
- contentIDs.AppendL( KMPXMediaIdGeneral );
+ if (!iCollectionHelper)
+ iCollectionHelper = CMPXCollectionHelperFactory::NewCollectionHelperL();
- CMPXMedia* media = CMPXMedia::NewL( contentIDs.Array() );
- CleanupStack::PushL( media );
- contentIDs.Close();
- CleanupStack::PopAndDestroy(media); */
+ // if this leaves, not much we can do anyway
+ TRAP_IGNORE(iCollectionHelper->AddL(aShowInfo.FileName(), this));
+
}
void CShowEngine::CompleteL(CHttpClient* /*aHttpClient*/, TInt aError)
@@ -683,8 +682,7 @@
// 2. select the first MaxListItems shows
// 3. delete the rest if downloadstate is ENotDownloaded
- _LIT(KSqlStatement,"delete from shows where feeduid=%u and downloadstate=0 and uid not in " \
- "(select uid from shows where feeduid=%u order by pubdate desc limit %u)");
+ _LIT(KSqlStatement,"delete from shows where feeduid=%u and downloadstate=0 and uid not in (select uid from shows where feeduid=%u order by pubdate desc limit %u)");
iSqlBuffer.Format(KSqlStatement, aFeedUid, aFeedUid, iPodcastModel.SettingsEngine().MaxListItems());
sqlite3_stmt *st;
@@ -786,8 +784,7 @@
descPtr.Copy(aItem.Description());
PodcastUtils::SQLEncode(descPtr);
- _LIT(KSqlStatement, "insert into shows (url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype)"
- " values (\"%S\",\"%S\", \"%S\", \"%S\", \"%Lu\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%Lu\", \"%d\")");
+ _LIT(KSqlStatement, "insert into shows (url, title, description, filename, position, playtime, playstate, downloadstate, feeduid, uid, showsize, trackno, pubdate, showtype) values (\"%S\",\"%S\", \"%S\", \"%S\", \"%Lu\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%u\", \"%Lu\", \"%d\")");
iSqlBuffer.Format(KSqlStatement, &aItem.Url(), &titlePtr, &descPtr,
&aItem.FileName(), aItem.Position().Int64(), aItem.PlayTime(),
@@ -860,9 +857,7 @@
descPtr.Copy(aItem.Description());
PodcastUtils::SQLEncode(descPtr);
- _LIT(KSqlStatement, "update shows set url=\"%S\", title=\"%S\", description=\"%S\", filename=\"%S\", position=\"%Lu\","
- "playtime=\"%u\", playstate=\"%u\", downloadstate=\"%u\", feeduid=\"%u\", showsize=\"%u\", trackno=\"%u\","
- "pubdate=\"%Lu\", showtype=\"%d\", lasterror=\"%d\" where uid=\"%u\"");
+ _LIT(KSqlStatement, "update shows set url=\"%S\", title=\"%S\", description=\"%S\", filename=\"%S\", position=\"%Lu\" playtime=\"%u\", playstate=\"%u\", downloadstate=\"%u\", feeduid=\"%u\", showsize=\"%u\", trackno=\"%u\",pubdate=\"%Lu\", showtype=\"%d\", lasterror=\"%d\" where uid=\"%u\"");
iSqlBuffer.Format(KSqlStatement, &aItem.Url(), &titlePtr, &descPtr,
&aItem.FileName(), aItem.Position().Int64(), aItem.PlayTime(),
aItem.PlayState(), aItem.DownloadState(), aItem.FeedUid(),
diff -r 70749e2f572d -r c2f1ea38ec70 group/bld.inf
--- a/group/bld.inf Thu Apr 29 11:55:32 2010 +0100
+++ b/group/bld.inf Thu May 13 13:56:05 2010 +0100
@@ -15,25 +15,9 @@
* Description:
*
*/
-
-PRJ_PLATFORMS
-GCCE
-WINSCW
-PRJ_MMPFILES
-
-#ifdef SQLITE_INCLUDED
-..\engine\sqlite\group\sqlite.mmp
-#endif
-
-PRJ_MMPFILES
-..\engine\group\engine.mmp
-
-gnumakefile ..\application\group\icons.mk
-..\application\group\Podcast.mmp
+#include "..\engine\group\bld.inf"
+#include "..\application\group\bld.inf"
PRJ_EXPORTS
-..\engine\config\podcatcher.sqlite \epoc32\winscw\c\private\A0009D00\podcatcher.sqlite.template
-..\engine\config\defaultfeeds.xml \epoc32\winscw\c\private\A0009D00\defaultfeeds.xml
-..\engine\config\testfeeds.xml \epoc32\winscw\c\data\testfeeds.xml
-..\application\help\podcatcher.hlp \epoc32\winscw\c\resource\help\podcatcher.hlp
+podcatcher.iby CORE_APP_LAYER_IBY_EXPORT_PATH(podcatcher.iby)
\ No newline at end of file
diff -r 70749e2f572d -r c2f1ea38ec70 group/podcatcher.iby
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/group/podcatcher.iby Thu May 13 13:56:05 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
diff -r 70749e2f572d -r c2f1ea38ec70 package_definition.xml
--- a/package_definition.xml Thu Apr 29 11:55:32 2010 +0100
+++ b/package_definition.xml Thu May 13 13:56:05 2010 +0100
@@ -1,10 +1,91 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+]>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+