# HG changeset patch
# User Brendan Donegan <brendand@symbian.org>
# Date 1275604738 -3600
# Node ID e3f9b65d6910adbe904c7319eba44d09c222191e
# Parent  2e626f5a52c8dccc8173da75bcae0796ad148982
Cleanup from the merge

diff -r 2e626f5a52c8 -r e3f9b65d6910 engine/inc/ShowEngine.h
--- a/engine/inc/ShowEngine.h	Thu Jun 03 22:18:04 2010 +0100
+++ b/engine/inc/ShowEngine.h	Thu Jun 03 23:38:58 2010 +0100
@@ -44,7 +44,7 @@
 	};
 
 class CShowEngine : public CBase, public MHttpClientObserver, public MMetaDataReaderObserver
-{
+	{
 public:
 	IMPORT_C static CShowEngine* NewL(CPodcastModel& aPodcastModel);
 	IMPORT_C virtual ~CShowEngine();
@@ -151,17 +151,17 @@
 
 	// The show we are currently downloading
 	CShowInfo* iShowDownloading;
-    	TUint iDownloadErrors;
+    TUint iDownloadErrors;
     
-    	CMetaDataReader* iMetaDataReader;
+    CMetaDataReader* iMetaDataReader;
     
-    	RApaLsSession iApaSession;
+    RApaLsSession iApaSession;
 	TBuf8<512> iRecogBuffer;
 	
 	sqlite3& iDB;
-    	TBuf<KDefaultSQLDataBufferLength> iSqlBuffer;
+    TBuf<KDefaultSQLDataBufferLength> iSqlBuffer;
    	TShowFilter iShowFilter;
-};
+	};
 
 #endif /*SHOWENGINE_H_*/
 
diff -r 2e626f5a52c8 -r e3f9b65d6910 engine/src/PodcastModel.cpp
--- a/engine/src/PodcastModel.cpp	Thu Jun 03 22:18:04 2010 +0100
+++ b/engine/src/PodcastModel.cpp	Thu Jun 03 23:38:58 2010 +0100
@@ -226,7 +226,7 @@
 	return *iConnectionEngine;
 }
 
-EXPORT_C void CPodcastModel::PlayPausePodcastL(CShowInfo* aPodcast, TBool aPlayOnInit) 
+EXPORT_C void CPodcastModel::PlayPausePodcastL(CShowInfo* aPodcast, TBool /*aPlayOnInit*/) 
 	{
 	DP("CPodcastModel::PlayPausePodcastL BEGIN");
 	TRAPD(err, LaunchFileEmbeddedL(aPodcast->FileName()));
diff -r 2e626f5a52c8 -r e3f9b65d6910 engine/src/ShowEngine.cpp
--- a/engine/src/ShowEngine.cpp	Thu Jun 03 22:18:04 2010 +0100
+++ b/engine/src/ShowEngine.cpp	Thu Jun 03 23:38:58 2010 +0100
@@ -1450,6 +1450,11 @@
 		}
 	}
 
+EXPORT_C void CShowEngine::SetShowFilter(TShowFilter aFilter)
+	{
+	iShowFilter = aFilter;
+	}
+
 EXPORT_C void CShowEngine::MoveDownloadUpL(TUint aUid)
 	{
 	DP("CShowEngine::MoveDownLoadUpL");