--- a/application/data/PodcastClient_english.rls Mon Mar 08 20:16:56 2010 +0000
+++ b/application/data/PodcastClient_english.rls Wed Mar 10 23:26:17 2010 +0000
@@ -58,6 +58,9 @@
rls_string STRING_r_podcast_setting_alwaysask "Always ask"
rls_string STRING_r_podcast_setting_useiap "Select access point"
rls_string STRING_r_podcast_setting_iaplist "Access points"
+rls_string STRING_r_on "On"
+rls_string STRING_r_off "Off"
+
// Choicelist for autodownload
rls_string STRING_podcast_autoupdate_option1 "Off"
--- a/application/data/PodcastStrings.ra Mon Mar 08 20:16:56 2010 +0000
+++ b/application/data/PodcastStrings.ra Wed Mar 10 23:26:17 2010 +0000
@@ -16,22 +16,10 @@
*
*/
-RESOURCE TBUF r_podcast_main_player_cmd{buf = STRING_r_view_player_cmd;}
-RESOURCE TBUF r_podcast_show_cmd{buf = STRING_r_view_show_cmd;}
-RESOURCE TBUF r_podcast_update_cmd{buf = STRING_r_update_feeds_cmd;}
RESOURCE TBUF r_podcast_update_all_cmd{buf = STRING_r_update_all_feeds_cmd;}
-RESOURCE TBUF r_podcast_view_cmd {buf = STRING_r_view_cmd;}
-RESOURCE TBUF r_podcast_remove_feed_title {buf = STRING_r_remove_feed_title;}
RESOURCE TBUF r_podcast_remove_feed_prompt {buf = STRING_r_remove_feed_prompt;}
-RESOURCE TBUF r_podcast_update_new_feed_title {buf = STRING_r_update_new_feed_title;}
RESOURCE TBUF r_podcast_update_new_feed_prompt {buf = STRING_r_update_new_feed_prompt;}
-RESOURCE TBUF r_podcast_delete_played_title {buf = STRING_r_delete_played_title;}
-RESOURCE TBUF r_podcast_delete_played_prompt {buf = STRING_r_delete_played_prompt;}
-RESOURCE TBUF r_podcast_delete_show_title {buf = STRING_r_delete_show_title;}
RESOURCE TBUF r_podcast_delete_show_prompt {buf = STRING_r_delete_show_prompt;}
-RESOURCE TBUF r_podcast_remove_chapter_title {buf = STRING_r_remove_chapter_title;}
-RESOURCE TBUF r_podcast_remove_chapter_prompt {buf = STRING_r_remove_chapter_prompt;}
-RESOURCE TBUF r_podcast_enable_downloads_title {buf = STRING_r_enable_downloads_title;}
RESOURCE TBUF r_podcast_enable_downloads_prompt {buf = STRING_r_enable_downloads_prompt;}
RESOURCE TBUF r_podcast_feeds_title_format {buf = STRING_r_podcast_feeds_title_format;}
RESOURCE TBUF r_podcast_feeds_status_format {buf = STRING_r_podcast_feeds_status_format;}
@@ -47,30 +35,19 @@
RESOURCE TBUF r_podcast_feeds_never_updated {buf = STRING_r_podcast_shows_never_updated;}
RESOURCE TBUF r_podcast_feeds_is_updating {buf = STRING_r_podcast_feeds_is_updating;}
RESOURCE TBUF r_podcast_feeds_no_feeds {buf = STRING_r_podcast_no_feeds;}
-RESOURCE TBUF r_podcast_import_feeds_title {buf = STRING_r_view_import_feeds_title;}
-RESOURCE TBUF r_podcast_export_feeds_title {buf = STRING_r_view_export_feeds_title;}
RESOURCE TBUF r_podcast_export_feeds_softkey {buf = STRING_r_view_export_feeds_softkey;}
RESOURCE TBUF r_podcast_pending_status_active {buf = STRING_r_podcast_shows_title_download;}
RESOURCE TBUF r_podcast_pending_status_suspended {buf = STRING_r_podcast_shows_downloads_suspended;}
RESOURCE TBUF r_podcast_feeds_status {buf = STRING_r_view_feeds_status;}
RESOURCE TBUF r_add_feed_exists {buf = STRING_r_add_feed_exists;}
-RESOURCE TBUF r_add_feed_exists_title {buf = STRING_r_add_feed_exists_title;}
RESOURCE TBUF r_add_feed_replace {buf = STRING_r_add_feed_replace;}
-RESOURCE TBUF r_add_feed_replace_title {buf = STRING_r_add_feed_replace_title;}
-RESOURCE TBUF r_catchup_feed {buf = STRING_r_catchup_feed;}
-RESOURCE TBUF r_catchup_feed_title {buf = STRING_r_catchup_feed_title;}
RESOURCE TBUF r_remove_all_dlg {buf = STRING_r_remove_all_dlg;}
-RESOURCE TBUF r_question_title {buf = STRING_r_question_title;}
RESOURCE TBUF r_podcast_addfeed_prompt {buf = STRING_r_add_feed_prompt;}
RESOURCE TBUF r_podcast_addfeed_title_prompt {buf = STRING_r_add_feed_title_prompt;}
RESOURCE TBUF r_tabgroup_feeds {buf = STRING_r_tabgroup_feeds;}
RESOURCE TBUF r_tabgroup_queue {buf = STRING_r_tabgroup_queue;}
RESOURCE TBUF r_tabgroup_queue_counter {buf = STRING_r_tabgroup_queue_counter;}
-RESOURCE TBUF r_tabgroup_search {buf = STRING_r_search;}
-RESOURCE TBUF r_tabgroup_shows {buf = STRING_r_tabgroup_shows;}
-RESOURCE TBUF r_search_prompt {buf = STRING_r_search_title;}
RESOURCE TBUF r_podcast_no_search_results {buf = STRING_r_podcast_empty_list;}
-RESOURCE TBUF r_add_feed_title {buf=STRING_add_feed_title;}
RESOURCE TBUF r_add_feed_query {buf=STRING_add_feed_query;}
RESOURCE TBUF r_add_feed_success {buf=STRING_add_feed_success;}
RESOURCE TBUF r_add_feed_failure {buf=STRING_add_feed_error;}
--- a/engine/group/engine.mmp Mon Mar 08 20:16:56 2010 +0000
+++ b/engine/group/engine.mmp Wed Mar 10 23:26:17 2010 +0000
@@ -37,7 +37,6 @@
SOURCE FeedParser.cpp
SOURCE FeedEngine.cpp
SOURCE ShowInfo.cpp
-SOURCE SoundEngine.cpp
SOURCE FeedInfo.cpp
SOURCE FeedTimer.cpp
SOURCE ShowEngine.cpp
--- a/engine/inc/PodcastModel.h Mon Mar 08 20:16:56 2010 +0000
+++ b/engine/inc/PodcastModel.h Wed Mar 10 23:26:17 2010 +0000
@@ -36,7 +36,6 @@
//#define DONT_SORT_SQL
class RCmManager;
class CFeedEngine;
-class CSoundEngine;
class CShowEngine;
class CSettingsEngine;
class CCommsDatabase;
@@ -60,7 +59,6 @@
IMPORT_C ~CPodcastModel();
IMPORT_C CFeedEngine& FeedEngine();
IMPORT_C CShowEngine& ShowEngine();
- IMPORT_C CSoundEngine& SoundEngine();
IMPORT_C CSettingsEngine& SettingsEngine();
IMPORT_C CConnectionEngine& ConnectionEngine();
IMPORT_C CShowInfo* PlayingPodcast();
@@ -108,7 +106,6 @@
CFeedEngine* iFeedEngine;
CShowEngine* iShowEngine;
- CSoundEngine* iSoundEngine;
CSettingsEngine *iSettingsEngine;
CConnectionEngine* iConnectionEngine;
RShowInfoArray iActiveShowList;
--- a/engine/src/PodcastModel.cpp Mon Mar 08 20:16:56 2010 +0000
+++ b/engine/src/PodcastModel.cpp Wed Mar 10 23:26:17 2010 +0000
@@ -19,7 +19,6 @@
#include <commdb.h>
#include "PodcastModel.h"
#include "FeedEngine.h"
-#include "SoundEngine.h"
#include "SettingsEngine.h"
#include "ShowEngine.h"
#include "connectionengine.h"
@@ -45,7 +44,6 @@
{
delete iFeedEngine;
- delete iSoundEngine;
delete iSettingsEngine;
delete iShowEngine;
@@ -89,7 +87,6 @@
iFeedEngine = CFeedEngine::NewL(*this);
iShowEngine = CShowEngine::NewL(*this);
- iSoundEngine = CSoundEngine::NewL(*this);
DP("CPodcastModel::ConstructL END");
}
@@ -199,11 +196,6 @@
return *iShowEngine;
}
-EXPORT_C CSoundEngine& CPodcastModel::SoundEngine()
-{
- return *iSoundEngine;
-}
-
EXPORT_C CSettingsEngine& CPodcastModel::SettingsEngine()
{
return *iSettingsEngine;
@@ -216,40 +208,8 @@
EXPORT_C void CPodcastModel::PlayPausePodcastL(CShowInfo* aPodcast, TBool aPlayOnInit)
{
-
- // special treatment if this podcast is already active
- if (iPlayingPodcast->Uid() == aPodcast->Uid() && SoundEngine().State() > ESoundEngineOpening ) {
- if (aPodcast->PlayState() == EPlaying) {
- SoundEngine().Pause();
- aPodcast->SetPosition(iSoundEngine->Position());
- aPodcast->SetPlayState(EPlayed);
- aPodcast->SetPlayState(EPlayed);
- } else {
- iSoundEngine->Play();
- }
- } else {
- // switching file, so save position
- iSoundEngine->Pause();
- if (iPlayingPodcast != NULL) {
- iPlayingPodcast->SetPosition(iSoundEngine->Position());
- }
-
- iSoundEngine->Stop(EFalse);
-
- // we play video podcasts through the external player
- if(aPodcast != NULL && aPodcast->ShowType() != EVideoPodcast) {
- DP1("Starting: %S", &(aPodcast->FileName()));
- TRAPD( error, iSoundEngine->OpenFileL(aPodcast->FileName(), aPlayOnInit) );
- if (error != KErrNone) {
- DP1("Error: %d", error);
- } else {
- iSoundEngine->SetPosition(aPodcast->Position().Int64() / 1000000);
- }
- }
-
- iPlayingPodcast = aPodcast;
+ // TODO: interact with MPX
}
-}
EXPORT_C CFeedInfo* CPodcastModel::ActiveFeedInfo()
{
--- a/engine/src/SettingsEngine.cpp Mon Mar 08 20:16:56 2010 +0000
+++ b/engine/src/SettingsEngine.cpp Wed Mar 10 23:26:17 2010 +0000
@@ -19,7 +19,6 @@
#include <bautils.h>
#include <s32file.h>
#include "SettingsEngine.h"
-#include "SoundEngine.h"
#include "FeedEngine.h"
#include "ShowEngine.h"
--- a/engine/src/ShowEngine.cpp Mon Mar 08 20:16:56 2010 +0000
+++ b/engine/src/ShowEngine.cpp Wed Mar 10 23:26:17 2010 +0000
@@ -24,7 +24,6 @@
#include "SettingsEngine.h"
#include <e32hashtab.h>
#include <httperr.h>
-#include "SoundEngine.h"
#include "debug.h"
#include "PodcastUtils.h"
@@ -1065,11 +1064,6 @@
if (aShowInfoArray[i]->PlayState() == EPlayed
&& aShowInfoArray[i]->FileName().Length() > 0)
{
- if (CompareShowsByUid(*(iPodcastModel.PlayingPodcast()), *(aShowInfoArray[i]))
- && iPodcastModel.SoundEngine().State() != ESoundEngineNotInitialized)
- {
- iPodcastModel.SoundEngine().Stop();
- }
BaflUtils::DeleteFile(iPodcastModel.FsSession(), aShowInfoArray[i]->FileName());
aShowInfoArray[i]->SetDownloadState(ENotDownloaded);
DBUpdateShowL(*aShowInfoArray[i]);