diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/mw/remconmediainformationtargetobserver.h
--- a/epoc32/include/mw/remconmediainformationtargetobserver.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/mw/remconmediainformationtargetobserver.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -13,8 +13,6 @@
 // Description:
 //
 
-
-
 /**
  @file
  @publishedAll
@@ -25,33 +23,7 @@
 #define REMCONMEDIAINFORMATIONTARGETOBSERVER_H
 
 #include <e32base.h>
-
-enum TMediaAttributeId
-	{
-	ETitleOfMedia 			=0x1,
-	ENameOfArtist			=0x2,
-	ENameOfAlbum			=0x3,
-	ETrackNumber			=0x4,		/* for example the CD track number */
-	ENumberOfTracks			=0x5,		/* for example the total track number of the CD */
-	EGenre					=0x6,
-	EPlayingTime			=0x7
-	};
-
-/**
- * Provide an iterator wrapper class 
- */
-class TMediaAttributeIter
-	{
-public:
-	TMediaAttributeIter(RArray<TMediaAttributeId>& aMediaAttributeIDs);
-	IMPORT_C void Start();
-	IMPORT_C TBool Next(TMediaAttributeId& aId);
-	
-private:
-	RArray<TMediaAttributeId>& iMediaAttributeIDs;
-	TInt iterator;
-	};
-
+#include <remconmediaattributeid.h>
 
 /**
 Clients must implement this interface in order to instantiate objects of type 
@@ -66,7 +38,7 @@
 	For each element in aAttributeList for which the requested Metadata is available,
 	the client shall respond by calling CRemConMediaInformationTarget::AttributeValue(). 
 	After all attributes have been supplied the client shall call CRemConMediaInformationTarget::Completed().
-	@param aAttributeList A CMediaAttributeIDs containing a list of TMediaAttributeIds requested by the controller
+	@param aAttributeIter A CMediaAttributeIDs containing a list of TMediaAttributeIds requested by the controller
 	@see CRemConMediaInformationTarget::AttributeValue()
 	@see CRemConMediaInformationTarget::Completed()
 	*/