Update of /cvsroot/player/music/servicekit/pub
In directory cvs-new:/tmp/cvs-serv21825/pub

Modified Files:
	mmp_service.h mmp_service_xmldefs.h 
Log Message:
implemented caching and enabled image retrieval

Index: mmp_service.h
===================================================================
RCS file: /cvsroot/player/music/servicekit/pub/mmp_service.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mmp_service.h	31 Aug 2004 07:01:09 -0000	1.6
+++ mmp_service.h	2 Sep 2004 08:37:02 -0000	1.7
@@ -35,14 +35,22 @@
 #ifndef MMP_SERVICE_H_
 #define MMP_SERVICE_H_
 
+#include <f32file.h>
+
 #include "hxresult.h"
 #include "hxtypes.h"
 #include "hxstring.h"
 
+#include "mmp_library_track.h"
 #include "mmp_httpclient.h"
 
+class CAsyncCallBack;
+
 typedef enum {
-    kServiceArtistBio = 0,
+    kServiceTrack = 0,
+    kServiceAlbum,
+    kServiceArtist,
+    kServiceArtistBio,
     kServiceArtistImageURL,
     kServiceArtistImageLocation,
     kServiceSimilarContemporary,
@@ -71,7 +79,7 @@
     CMmpService();
     ~CMmpService();
 
-    HX_RESULT GetMetaData(UINT32 ulArtistID, UINT32 ulAlbumID, UINT32 ulTrackID);
+    HX_RESULT GetMetaData(const CMmpTrack* pTrack);
 
     void SetData(HxServiceData type, char* data);
     HX_RESULT GetData(HxServiceData type, CHXString& data) const;
@@ -86,28 +94,45 @@
 private:
     void ResetMetaData();
 
+    HX_RESULT GetImage(const CHXString& url, const TDesC& imageFileName, bool& cached);
+
+    static TInt _ProcessResponse(TAny* obj);
+
+    HX_RESULT ProcessResponse();
+
 private:
     bool m_bIsValid;
 
-    CHttpClient *m_pHttpClient;
-
     TInt m_trackNum;
 
     HxServiceState m_state;
 
+    CHttpClient *m_pHttpClient;
+
+				// file server
+    RFs m_fs;
+
+    CMmpTrack m_CurrentTrack;
+
+    TFileName m_MetaDataFileName;
+    
+    TFileName m_ArtistImageFileName;
+
+    TFileName m_AlbumImageFileName;
+
     TBuf<256>   m_requestUrl;
 
     CHXString	m_ArtistBio;
     CHXString	m_ArtistImageURL;
-    CHXString	m_ArtistImageLocation;
     CHXString	m_SimilarContemporary;
     CHXString	m_SimilarFollowing;
     CHXString	m_SimilarInfluencing;
-    CHXString	m_AlbumArtURL;
-    CHXString	m_AlbumArtLocation;
+    CHXString	m_AlbumImageURL;
     CHXString	m_AlbumReview;
     CHXString	m_AlbumTrackID;
     CHXString	m_AlbumTrackName;
+
+    CAsyncCallBack* m_pCallBack;
 };
 
 #endif /* MMP_SERVICE_H_ */

Index: mmp_service_xmldefs.h
===================================================================
RCS file: /cvsroot/player/music/servicekit/pub/mmp_service_xmldefs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mmp_service_xmldefs.h	28 Aug 2004 00:16:20 -0000	1.2
+++ mmp_service_xmldefs.h	2 Sep 2004 08:37:02 -0000	1.3
@@ -55,7 +55,7 @@
 //
 
 #define HXSERVICEXML_ARTIST_BIO		"fullbio"
-#define HXSERVICEXML_ARTIST_IMAGE_URL	"image"
+#define HXSERVICEXML_ARTIST_IMAGE_URL	"art"
 
 #define HXSERVICEXML_ARTIST_ID		"artistid"
 #define HXSERVICEXML_ARTIST_NAME	"artistname"