--- a/internetradio2.0/presetplugininc/irpresetimpl.h	Thu May 27 12:46:34 2010 +0300
+++ b/internetradio2.0/presetplugininc/irpresetimpl.h	Fri Jun 11 13:30:40 2010 +0300
@@ -318,6 +318,8 @@
 	*/
 	const TDesC& GetAdvertisementUrl() const;
 
+	const TDesC& GetAdvertisementInUse() const;
+	
 	/**
 	*CIRPresetImpl::GetImgUrl()
 	*gets the channel  image url
@@ -332,19 +334,14 @@
 	*/
 	TInt GetUrlCount()const;
 
+	CIRChannelServerUrl& GetUrl(TInt aIndex) const;
+	
 	/*
 	*CIRPresetImpl::GetLogoData()
 	*gets the Logo Data
 	*@return TDesC8&
 	*/
     const TDesC8& GetLogoData() const;
-
-	/**
-	*CIRPresetImpl::GetUrl()
-	*gets the channel  url from zeroth position
-	*@return CIRChannelServerUrlImpl&
-	*/
-	CIRChannelServerUrlImpl& GetUrl(TInt aInt)const;
 	
 	/*
 	 * get the channel url at specified position
@@ -390,20 +387,6 @@
 	*/
 	RArray<TInt>& GetAvailableBitrates();
 
-    /**
-	*CIRPresetImpl::UniqId()
-	*gets the unique id
-	*@return TUint32
-	*/
-	TUint32 UniqId() ;
-
-	/**
-	*CIRPresetImpl::SetUniqId()
-	*sets the unique id for the preset
-	*@param aId
-	*/
-	void SetUniqId( TUint32 aUniqId);
-
     /*
      * Returns the played times of the channel
      */
@@ -414,6 +397,10 @@
      */
     void SetPlayedTimes(TInt aPlayedTimes);
     
+    TBool GetRenamed() const;
+    
+    void SetRenamed();
+    
 protected:
 
     /**CIRPresetImpl::CIRIsdsPreset()
@@ -449,11 +436,6 @@
 private:
 
 	/**
-	 * unique id generated for the preset saved at favourite
-	 */
-	TUint32 iUniqId;
-
-	/**
 	 * no of channel urls
 	 */
 	TInt iChannelUrlCount;
@@ -464,11 +446,6 @@
 	TInt iType;
 
 	/**
-	 * index in the preset table
-	 */
-	//TInt iIndex;not required
-
-	/**
 	 * isds generated preset id
 	 */
 	TInt iPresetId;
@@ -544,24 +521,21 @@
 	 */
 	RBuf iMusicStoreStatus;
 
-
 	/**
 	 * url array
 	 */
-	CDesCArrayFlat* iUrlForBitrate;
-
-	/**
-	 * url array
-	 */
-	CArrayPtrFlat<CIRChannelServerUrlImpl>* iUrlArray;
+	CArrayPtrFlat<CIRChannelServerUrl>* iUrlArray;
 
 	/**
 	 * bitrate array
 	 */
 	RArray<TInt> iBitrateArray;
 	
-	//added by Peter on June 23rd, 2009
+	//how many times the station has been played
 	TInt iPlayedTimes;
+	
+	//if the station is renamed after it's added into favorites
+	TBool iRenamed;
 	};
 
 #endif	//end of IRPRESETIMPL_H