diff -r 7bca37ba5fa9 -r 66c5303f3610 engine/src/ShowEngine.cpp --- a/engine/src/ShowEngine.cpp Mon Mar 01 22:57:56 2010 +0000 +++ b/engine/src/ShowEngine.cpp Sat Mar 06 10:22:09 2010 +0000 @@ -115,7 +115,7 @@ DP("CShowEngine::ResumeDownloadsL END"); } -EXPORT_C void CShowEngine::RemoveAllDownloads() +EXPORT_C void CShowEngine::RemoveAllDownloadsL() { if (!iPodcastModel.SettingsEngine().DownloadSuspended()) { @@ -145,7 +145,7 @@ if (info != NULL) { info->SetDownloadState(ENotDownloaded); - DBUpdateShow(*info); + DBUpdateShowL(*info); delete info; } DBRemoveDownload(aUid); @@ -231,7 +231,7 @@ if (showInfo == NULL) { - DBAddShow(aItem); + DBAddShowL(aItem); return ETrue; } else @@ -299,7 +299,7 @@ } iShowDownloading->SetDownloadState(EDownloaded); - DBUpdateShow(*iShowDownloading); + DBUpdateShowL(*iShowDownloading); DBRemoveDownload(iShowDownloading->Uid()); AddShowToMpxCollection(*iShowDownloading); NotifyShowFinishedL(aError); @@ -313,7 +313,7 @@ if(aError >= HTTPStatus::EBadRequest && aError <= HTTPStatus::EBadRequest+200) { iShowDownloading->SetDownloadState(EFailedDownload); - DBUpdateShow(*iShowDownloading); + DBUpdateShowL(*iShowDownloading); DBRemoveDownload(iShowDownloading->Uid()); NotifyShowFinishedL(aError); @@ -323,7 +323,7 @@ else // other kind of error, missing network etc, reque this show { iShowDownloading->SetDownloadState(EQueued); - DBUpdateShow(*iShowDownloading); + DBUpdateShowL(*iShowDownloading); } iDownloadErrors++; @@ -343,7 +343,7 @@ if(iShowDownloading) { iShowDownloading->SetDownloadState(EQueued); - DBUpdateShow(*iShowDownloading); + DBUpdateShowL(*iShowDownloading); } iPodcastModel.SettingsEngine().SetDownloadSuspended(ETrue); NotifyShowFinishedL(aError); @@ -734,7 +734,7 @@ showInfo->SetLastError(lasterror); } -TBool CShowEngine::DBAddShow(const CShowInfo& aItem) +TBool CShowEngine::DBAddShowL(const CShowInfo& aItem) { DP2("CShowEngine::DBAddShow, title=%S, URL=%S", &aItem.Title(), &aItem.Url()); @@ -804,7 +804,7 @@ sqlite3_finalize(st); } -TBool CShowEngine::DBUpdateShow(CShowInfo& aItem) +TBool CShowEngine::DBUpdateShowL(CShowInfo& aItem) { DP1("CShowEngine::DBUpdateShow, title='%S'", &aItem.Title()); @@ -1058,7 +1058,7 @@ } } -EXPORT_C void CShowEngine::DeletePlayedShows(RShowInfoArray &aShowInfoArray) +EXPORT_C void CShowEngine::DeletePlayedShowsL(RShowInfoArray &aShowInfoArray) { for (TInt i = 0; i < aShowInfoArray.Count(); i++) { @@ -1072,7 +1072,7 @@ } BaflUtils::DeleteFile(iPodcastModel.FsSession(), aShowInfoArray[i]->FileName()); aShowInfoArray[i]->SetDownloadState(ENotDownloaded); - DBUpdateShow(*aShowInfoArray[i]); + DBUpdateShowL(*aShowInfoArray[i]); } } } @@ -1116,7 +1116,7 @@ } info->SetDownloadState(ENotDownloaded); - DBUpdateShow(*info); + DBUpdateShowL(*info); delete info; } } @@ -1159,7 +1159,7 @@ EXPORT_C void CShowEngine::AddDownloadL(CShowInfo& aInfo) { aInfo.SetDownloadState(EQueued); - DBUpdateShow(aInfo); + DBUpdateShowL(aInfo); DBAddDownload(aInfo.Uid()); DownloadNextShowL(); } @@ -1199,14 +1199,14 @@ DP1("CShowEngine::DownloadNextShow\tDownloading: %S", &(info->Title())); info->SetDownloadState(EDownloading); info->SetLastError(KErrNone); - DBUpdateShow(*info); + DBUpdateShowL(*info); iShowDownloading = info; TRAPD(error,getOk = GetShowL(info)); if (error != KErrNone || !getOk) { info->SetDownloadState(EFailedDownload); DBRemoveDownload(info->Uid()); - DBUpdateShow(*info); + DBUpdateShowL(*info); info = DBGetNextDownloadL(); if(info == NULL) @@ -1264,10 +1264,10 @@ } } -void CShowEngine::ReadMetaData(CShowInfo& aShowInfo) +void CShowEngine::ReadMetaDataL(CShowInfo& aShowInfo) { //DP1("Read %S", &(aShowInfo->Title())); - DBUpdateShow(aShowInfo); + DBUpdateShowL(aShowInfo); } void CShowEngine::ReadMetaDataCompleteL() @@ -1276,9 +1276,9 @@ MetaDataReader().SetIgnoreTrackNo(EFalse); } -EXPORT_C void CShowEngine::UpdateShow(CShowInfo& aInfo) +EXPORT_C void CShowEngine::UpdateShowL(CShowInfo& aInfo) { - DBUpdateShow(aInfo); + DBUpdateShowL(aInfo); } EXPORT_C CMetaDataReader& CShowEngine::MetaDataReader()