diff -r c9962d0368d9 -r 525c140ec8db tvout/tvoutengine/inc/glxtvconnectionmonitor.h --- a/tvout/tvoutengine/inc/glxtvconnectionmonitor.h Wed Jun 16 13:08:54 2010 +0100 +++ b/tvout/tvoutengine/inc/glxtvconnectionmonitor.h Thu Jul 22 16:33:32 2010 +0100 @@ -84,53 +84,58 @@ */ TBool IsHDMIConnected() const; - private: // From CActive /** * @ref CActive::RunL - */ + */ void RunL(); - + /** * @ref CActive::DoCancel - */ + */ void DoCancel(); - + /** * @ref CActive::RunError - */ - TInt RunError( TInt aError ); - - + */ + TInt RunError( TInt aError ); + + private: /** - * Requests TV on/off events - */ + * Requests TV on/off events + */ void IssueRequest(); /** * Sends notification to observers when TV Out cable is connected - */ + */ void IssueNotificationL(); - - void UpdateConnectionStatusL(); + + /** + * Updates the ConnectionState of Tv Out and HDMI + */ + void UpdateConnectionStatusL(); private: // class member data - + // Not owned: TV connection observer MGlxTvConnectionObserver& iConnectionObserver; - // TVout The Connection state - TBool iTvOutConnectionState; - - // TVout The Connection state - TBool iHDMIConnectionState; + // TVout The Connection state + TBool iIsTvOutConnected; + + // TVout The Connection state + TBool iIsHDMIConnected; + + // Headset The Connection state + TBool iIsHeadSetConnected; // The (external device) Accessory Server RAccessoryServer iTvAccServer; - - // Accessory mode + + // Accessory mode RAccessoryMode iTvAccMode; // Accessory Connection - details the type of accessory