--- a/engine/inc/PodcastModel.h	Thu Mar 11 20:53:00 2010 +0100
+++ b/engine/inc/PodcastModel.h	Tue Apr 27 19:26:48 2010 +0100
@@ -29,14 +29,13 @@
 #include "FeedInfo.h"
 #include "ShowInfo.h"
 #include "debug.h"
-#include "sqlite3.h"
+#include <sqlite3.h>
 #include "ImageHandler.h"
 
 // SQLite leaks memory when sorting, so to test our own memory leaks we need to disable this
 //#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();
@@ -87,13 +85,11 @@
 	TInt GetIapId();
 	
 	sqlite3* DB();
+	IMPORT_C void DropDB();
 	
-	IMPORT_C void GetAllShowsL();
-	IMPORT_C void GetNewShowsL();
-	IMPORT_C void GetShowsDownloadedL();
 	IMPORT_C void GetShowsDownloadingL();
 	IMPORT_C void GetShowsByFeedL(TUint aFeedUid);
-	IMPORT_C void MarkSelectionPlayed();
+	IMPORT_C void MarkSelectionPlayedL();
 	
 	TInt FindActiveShowByUid(TUint aUid);
 	IMPORT_C TBool IsFirstStartup();
@@ -101,14 +97,15 @@
 protected:
 	CPodcastModel();
 	void ConstructL();
+	void ResetDB();
+	void OpenDBL();
 	// From ImageHandler
-	void ImageOperationCompleteL(TInt aError, TUint aHandle);
+	void ImageOperationCompleteL(TInt aError, TUint aHandle, CPodcastModel& aPodcastModel);
 private:	
    CShowInfo* iPlayingPodcast;
    
    CFeedEngine* iFeedEngine;
    CShowEngine* iShowEngine;
-   CSoundEngine* iSoundEngine;
    CSettingsEngine *iSettingsEngine;
    CConnectionEngine* iConnectionEngine;
    RShowInfoArray iActiveShowList;