--- a/photosgallery/viewframework/tvout/inc/glxtvconnectionmonitor.h	Wed Apr 14 15:57:24 2010 +0300
+++ b/photosgallery/viewframework/tvout/inc/glxtvconnectionmonitor.h	Tue Apr 27 16:37:53 2010 +0300
@@ -29,18 +29,20 @@
 #include <AknWsEventObserver.h>     // for MAknWsEventObserver
 #include <AccessoryServer.h>        // for RAccessoryServer
 #include <AccessoryMode.h>          // for RAccessoryMode
+#include <AccessoryConnection.h>	// for RAccessoryConnection
+#include <AccPolGenericIDArray.h>
 
 
 // Forward Declarations
-class MGlxTvConnectionObserver;       
+class MGlxTvConnectionObserver;
 
 
 /**
  * Class Description
  * An Active object derived class is used to monitor the TV out connection
  * @author Loughlin
- */        
-NONSHARABLE_CLASS(CGlxTvConnectionMonitor) : public CActive 
+ */
+NONSHARABLE_CLASS(CGlxTvConnectionMonitor) : public CActive
     {
 public:
 
@@ -49,24 +51,24 @@
      */
     static CGlxTvConnectionMonitor* NewL(
                             MGlxTvConnectionObserver& aConnectionObserver);
-    
+
     /**
      * Destructor.
      */
     ~CGlxTvConnectionMonitor();
-    
+
 private:
 
     /**
      * Standard C++ constructor
      */
-    CGlxTvConnectionMonitor( 
+    CGlxTvConnectionMonitor(
                         MGlxTvConnectionObserver& aConnectionObserver);
-    
+
     /*
      * Symbian second stage construction
      */
-    void ConstructL(); 
+    void ConstructL();
 
 public: // class member functions
 
@@ -86,53 +88,55 @@
 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();
-    
+
 
 private: // class member data
-    
+
     // Not owned: TV connection observer
     MGlxTvConnectionObserver& iConnectionObserver;
 
-    // TVout The Connection state 
+    // TVout The Connection state
     TBool iTvOutConnectionState;
-    
-    // TVout The Connection state 
+
+    // TVout The Connection state
     TBool iHDMIConnectionState;
 
     // The (external device) Accessory Server
     RAccessoryServer iTvAccServer;
-    
-    // Accessory mode 
+
+    // Accessory mode
     RAccessoryMode iTvAccMode;
-    
-    // Accessory Mode structure - details the type of accessory
-    TAccPolAccessoryMode iCurrentAccMode; 
 
+    // Accessory Connection - details the type of accessory
+    RAccessoryConnection iTvAccCon;
+
+    //Class gives Generic ID
+    TAccPolGenericIDArray iCurrentAccArray;
     };