1.1 --- a/epoc32/include/mw/playerinformationtarget.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/mw/playerinformationtarget.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// 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
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -13,8 +13,6 @@
    1.16  // Description:
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file
    1.23   @publishedAll
    1.24 @@ -35,6 +33,7 @@
    1.25  
    1.26  class CRemConInterfaceSelector;
    1.27  class CPlayerApplicationSettings;
    1.28 +class TEventsMask;
    1.29  
    1.30  // This is the maximum length of the player application setting attribute and value strings
    1.31  const TInt KMaxPlayerApplicationSettingsValue = 255 ;
    1.32 @@ -116,6 +115,7 @@
    1.33  	void ProcessGetStatusAndBeginObserving(TUint aOperationId, TRegisterNotificationEvent aEventId, const TDesC8& aData);
    1.34  	void ProcessGetStatus(TUint aOperationId, TRegisterNotificationEvent aEventId);
    1.35  	void SendNotificationResponse(TRegisterNotificationEvent aEventId, TRemConMessageSubType aMsgSubType);
    1.36 +	void ProcessGetPlayStatusUpdate(const TDesC8& aData);
    1.37  	
    1.38  	// Capabilities API implementation from MPlayerCapabilitiesObserver
    1.39  	void DoClearEvents();
    1.40 @@ -135,7 +135,8 @@
    1.41  	void SendError(TInt, TInt);
    1.42  	void SendError(TInt, TInt, TRemConMessageSubType aSubType);
    1.43  	CPlayerApplicationSettings* GetSetting(TUint anAttribute);
    1.44 -	
    1.45 +	MPlayerEventsObserver::TTargetBatteryStatus DetectBatteryStatus();
    1.46 +
    1.47  private: // owned
    1.48  	RBuf8								iOutBuf;
    1.49  
    1.50 @@ -149,18 +150,21 @@
    1.51  	
    1.52  	// The time interval (received as part if the RegisterNotification) 
    1.53  	// in which the change in playback position will be notified
    1.54 -	TUint32								iPlayBackIntervalInMilliseconds;
    1.55 +	TUint32   							iPlayBackIntervalInMilliseconds;
    1.56  
    1.57  	TTargetBatteryStatus				iBatteryStatus;
    1.58  	TUint32 							iPlaybackPositionInMilliseconds;
    1.59  	TUint32								iLastNotifiedPlaybackPositionInMilliseconds;
    1.60  	
    1.61  	// data for MPlayerCapabilitiesObserver
    1.62 -	RArray<TRegisterNotificationEvent> 			iSupportedNotificationEventList;
    1.63 +	TEventsMask*						iSupportedNotificationEventList;
    1.64  	RArray<TInt> 						iCompanyIdList;
    1.65  
    1.66  	// list of events for which notifications have been request 
    1.67  	RArray<TRegisterNotificationEvent> 			iPendingNotificationEventList;
    1.68 +	
    1.69 +	// Whether we've been asked for an update when the play status changes
    1.70 +	TBool								iPlaybackStatusUpdatePending;
    1.71  
    1.72  	// Attribute (settings) data MPlayerApplicationSettingsObserver
    1.73  	RHashMap<TInt, CPlayerApplicationSettings*>		iPlayerApplicationSettings;