--- a/qtinternetradio/irqsonghistory/src/irqsonghistoryinfo.cpp	Mon Jun 21 22:33:45 2010 +0100
+++ b/qtinternetradio/irqsonghistory/src/irqsonghistoryinfo.cpp	Thu Jul 22 16:31:41 2010 +0100
@@ -99,6 +99,36 @@
 }
 
 // ---------------------------------------------------------------------------
+// IRQSongHistoryInfo::getGenreName
+// gets Channel genre name
+// ---------------------------------------------------------------------------
+//
+EXPORT_C const QString& IRQSongHistoryInfo::getGenreName() const 
+{
+  return iGenreName;
+}
+
+// ---------------------------------------------------------------------------
+// IRQSongHistoryInfo::getCountryName
+// gets Channel country name
+// ---------------------------------------------------------------------------
+//
+EXPORT_C const QString& IRQSongHistoryInfo::getCountryName() const 
+{
+  return iCountryName;
+}
+
+// ---------------------------------------------------------------------------
+// IRQSongHistoryInfo::getLanguageName
+// gets Channel language name
+// ---------------------------------------------------------------------------
+//
+EXPORT_C const QString& IRQSongHistoryInfo::getLanguageName() const 
+{
+  return iLanguageName;
+}
+
+// ---------------------------------------------------------------------------
 // IRQSongHistoryInfo::getMusicStoreStatus
 // gets Channel MusicStoreStatus
 // ---------------------------------------------------------------------------
@@ -148,6 +178,9 @@
         const QString& aChannelName,
         const QString& aChannelDesc,
         const QString& aImageUrl,
+	    const QString& aGenreName,
+	    const QString& aCountryName,
+	    const QString& aLanguageName,
         const QString& aMusicStoreStatus, 
         int aChannelType,
         int aChannelId,
@@ -159,6 +192,9 @@
     setChannelName(aChannelName);
     setChannelDesc(aChannelDesc);
     setImageUrl(aImageUrl);
+    setGenreName(aGenreName);
+    setCountryName(aCountryName);
+    setLanguageName(aLanguageName);    
     setMusicStoreStatus(aMusicStoreStatus);
     setChannelType(aChannelType);
     setChannelId(aChannelId);
@@ -225,6 +261,36 @@
 }
 
 // ---------------------------------------------------------------------------
+// IRQSongHistoryInfo::setGenreName
+// sets Channel genre name
+// ---------------------------------------------------------------------------
+//
+void IRQSongHistoryInfo::setGenreName(const QString& aGenreName)
+{
+	iGenreName = aGenreName;
+}
+
+// ---------------------------------------------------------------------------
+// IRQSongHistoryInfo::setCountryName
+// sets Channel country name
+// ---------------------------------------------------------------------------
+//
+void IRQSongHistoryInfo::setCountryName(const QString& aCountryName)
+{
+	iCountryName = aCountryName;
+}
+
+// ---------------------------------------------------------------------------
+// IRQSongHistoryInfo::setLanguageName
+// sets Channel language name
+// ---------------------------------------------------------------------------
+//
+void IRQSongHistoryInfo::setLanguageName(const QString& aLanguageName)
+{
+	iLanguageName = aLanguageName;
+}
+
+// ---------------------------------------------------------------------------
 // IRQSongHistoryInfo::setMusicStoreStatus
 // sets Channel's MusicStoreStatus
 // ---------------------------------------------------------------------------
@@ -278,11 +344,20 @@
     iSongArtist = aArtist;
 }
 
+EXPORT_C void IRQSongInfo::setStationName(const QString& aStationName)
+{
+    iStationName = aStationName;
+}
+
 EXPORT_C const QString& IRQSongInfo::getArtistName() const
 {
     return iSongArtist;
 }
 
+EXPORT_C const QString& IRQSongInfo::getStationName() const
+{
+    return iStationName;
+}
 EXPORT_C void IRQSongInfo::setMusicshopStatus(const QString& aStatus)
 {
     iMusicshopStatus = aStatus;
@@ -293,11 +368,12 @@
     return iMusicshopStatus;
 }
 
-EXPORT_C void IRQSongInfo::setAllInfo(const QString& aName, const QString& aArtist, const QString& aStatus)
+EXPORT_C void IRQSongInfo::setAllInfo(const QString& aName, const QString& aArtist, const QString& aStationName, const QString& aStatus)
 {
     iSongName =   aName;
     iSongArtist = aArtist;
-    iMusicshopStatus = aStatus;    
+    iStationName = aStationName;
+    iMusicshopStatus = aStatus;
 }