FCL/sf/app/photos: comparison tvout/tvoutengine/src/glxtvconnectionmonitor.cpp

equal deleted inserted replaced

-:c499df2dbb33
+:2c833fc9e98f
 //  EXTERNAL INCLUDES
 //  INTERNAL INCLUDES
 #include <glxlog.h>
+#include <glxtracer.h>
 #include <glxpanic.h>
 #include "glxtv.h"
 #include <AccPolGenericIdDefinitions.h>
 #include <AccPolSubblockNameArray.h>
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //
 CGlxTvConnectionMonitor* CGlxTvConnectionMonitor::NewL(
 MGlxTvConnectionObserver& aConnectionObserver )
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::NewL");
+TRACER("CGlxTvConnectionMonitor::NewL");
 CGlxTvConnectionMonitor* self = new (ELeave)
 CGlxTvConnectionMonitor( aConnectionObserver );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop( self );
 // Destructor
 //-----------------------------------------------------------------------------
 //
 CGlxTvConnectionMonitor::~CGlxTvConnectionMonitor()
 {
-GLX_LOG_INFO("~CGlxTvConnectionMonitor");
+TRACER("~CGlxTvConnectionMonitor");
 Cancel();
 iTvAccCon.CloseSubSession();
 iTvAccServer.Disconnect();
 }
 //-----------------------------------------------------------------------------
 //
 CGlxTvConnectionMonitor::CGlxTvConnectionMonitor
 ( MGlxTvConnectionObserver& aConnectionObserver )
 :CActive(EPriorityStandard),
-iConnectionObserver ( aConnectionObserver )
+iConnectionObserver ( aConnectionObserver ),
-{
+iTvOutConnectionState(EFalse),
-GLX_LOG_INFO("CGlxTvConnectionMonitor");
+iHDMIConnectionState(EFalse)
+{
+TRACER("CGlxTvConnectionMonitor");
 CActiveScheduler::Add( this );
 }
 //-----------------------------------------------------------------------------
 // Symbian second phase constructor
 //-----------------------------------------------------------------------------
 //
 void CGlxTvConnectionMonitor::ConstructL()
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::ConstructL");
+TRACER("CGlxTvConnectionMonitor::ConstructL");
 User::LeaveIfError(iTvAccServer.Connect());
 	User::LeaveIfError(iTvAccCon.CreateSubSession(iTvAccServer));
-	User::LeaveIfError(iTvAccCon.GetAccessoryConnectionStatus(iCurrentAccArray));
-	for (int i = 0; i < iCurrentAccArray.Count(); i++)
+	UpdateConnectionStatusL();
-		{
+	IssueRequest();
-		iTvOutConnectionState
-				= (iCurrentAccArray.GetGenericIDL(i).PhysicalConnectionCaps()
-						== KPCWired);
-		iHDMIConnectionState
-				= (iCurrentAccArray.GetGenericIDL(i).PhysicalConnectionCaps()
-						== KPCHDMI);
-		}
-IssueRequest();
 }
 //-----------------------------------------------------------------------------
 // From class CActive.
 // Receive notification of change in the connection state
 //-----------------------------------------------------------------------------
 //
 void CGlxTvConnectionMonitor::RunL()
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::RunL");
+TRACER("CGlxTvConnectionMonitor::RunL");
 // Check for errors
 User::LeaveIfError( iStatus.Int() );
 // Notify observers
 IssueNotificationL();
 // Request the next event
 // DoCancel
 //-----------------------------------------------------------------------------
 //
 void CGlxTvConnectionMonitor::DoCancel()
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::DoCancel");
+TRACER("CGlxTvConnectionMonitor::DoCancel");
 iTvAccCon.CancelGetAccessoryConnectionStatus();
 iTvAccCon.CancelNotifyAccessoryConnectionStatusChanged();
 }
 // IsConnected
 //-----------------------------------------------------------------------------
 //
 TBool CGlxTvConnectionMonitor::IsConnected() const
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::IsConnected");
+TRACER("CGlxTvConnectionMonitor::IsConnected");
 GLX_LOG_INFO1("CGlxTvConnectionMonitor::IsConnected iTvOutConnectionState=%d",iTvOutConnectionState);
 return iTvOutConnectionState;
 }
 //-----------------------------------------------------------------------------
 // IsConnected
 //-----------------------------------------------------------------------------
 //
 TBool CGlxTvConnectionMonitor::IsHDMIConnected() const
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::IsHDMIConnected");
+TRACER("CGlxTvConnectionMonitor::IsHDMIConnected");
 GLX_LOG_INFO1("CGlxTvConnectionMonitor::IsHDMIConnected iHDMIConnectionState=%d",iHDMIConnectionState);
 return iHDMIConnectionState;
 }
 //-----------------------------------------------------------------------------
 // Request accessory server events
 //-----------------------------------------------------------------------------
 //
 void CGlxTvConnectionMonitor::IssueRequest()
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueRequest");
+TRACER("CGlxTvConnectionMonitor::IssueRequest");
 if (!IsActive()) // required for testing
 {
 iTvAccCon.NotifyAccessoryConnectionStatusChanged(iStatus,iCurrentAccArray);
 SetActive();
 }
 }
 //-----------------------------------------------------------------------------
 // Sends notification to observers if TV Out is connected
 //-----------------------------------------------------------------------------
 //
 void CGlxTvConnectionMonitor::IssueNotificationL()
 {
-	GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueNotificationL");
+TRACER("CGlxTvConnectionMonitor::IssueNotificationL");
 	TBool previousTvState = iTvOutConnectionState;
 	TBool previousHDMIState = iHDMIConnectionState;
-	GLX_LOG_INFO2("previousTvState = %d , previousHDMIState = %d",
-			previousTvState,previousHDMIState);
+	// Update the connection status
+	UpdateConnectionStatusL();
-	//gets the TV status in to the iCurrentAccArray and haves the Latest Accesory in 0-index
-	User::LeaveIfError(iTvAccCon.GetAccessoryConnectionStatus(iCurrentAccArray));
+	// trigger tvstatus change only when there is actually a change the in the connection and not
+	// for spurious events
-	CAccPolSubblockNameArray* nameArray = CAccPolSubblockNameArray::NewL();
+	if (previousTvState !=iTvOutConnectionState || previousHDMIState != iHDMIConnectionState)
-	CleanupStack::PushL(nameArray);
+	    {
+	    GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueNotificationL - Connection Altered");
-	//
+	    iConnectionObserver.HandleTvConnectionStatusChangedL();
-	//  Get the number of currently connected accessories
+	    }
-	//  Loop through each connected accessory looking for
+	}
-	//  the desired capabilities
-	//
+//-----------------------------------------------------------------------------
-	iTvOutConnectionState = EFalse;
+// UpdateConnectionStatusL()
-	iHDMIConnectionState = EFalse;
+//-----------------------------------------------------------------------------
-	const TInt count = iCurrentAccArray.Count();
+//
-	for (TInt index = 0; index < count; index++)
+void CGlxTvConnectionMonitor::UpdateConnectionStatusL()
-		{
+{
-		TAccPolGenericID genId = iCurrentAccArray.GetGenericIDL(index);
+TRACER("CGlxTvConnectionMonitor::UpdateConnectionStatusL()");
-		//  Get all supported capabilities for this connected accessory.
-		iTvAccCon.GetSubblockNameArrayL(genId, *nameArray);
+GLX_LOG_INFO2("CGlxTvConnectionMonitor::UpdateConnectionStatusL previousTvState = %d , previousHDMIState = %d",
-		//  Check if this connected accessory supports TV-Out capabality.
+iTvOutConnectionState,iHDMIConnectionState);
-		if (nameArray->HasName(KAccVideoOut))
-			{
+//gets the TV status in to the iCurrentAccArray and haves the Latest Accesory in 0-index
-			GLX_LOG_INFO("TV-Out Capabilities Exist");
+User::LeaveIfError(iTvAccCon.GetAccessoryConnectionStatus(iCurrentAccArray));
-			TAccPolNameRecord nameRecord;
-			nameRecord.SetNameL(KAccVideoOut);
+CAccPolSubblockNameArray* nameArray = CAccPolSubblockNameArray::NewL();
-			TAccValueTypeTInt value;
+CleanupStack::PushL(nameArray);
-			iTvAccCon.GetValueL(genId, nameRecord, value);
+//  Get the number of currently connected accessories
-			if (value.iValue == EAccVideoOutEHDMI)
+//  Loop through each connected accessory looking for
-				{
+//  the desired capabilities
-				GLX_LOG_INFO("HDMI is connected Capabilities Exist");
+//
-				iHDMIConnectionState = ETrue;
+const TInt count = iCurrentAccArray.Count();
-				break;
+GLX_LOG_INFO1("CGlxTvConnectionMonitor::UpdateConnectionStatusL current count value is %d",count);
-				}
+for (TInt index = 0; index <count; index++)
-			else if (value.iValue == EAccVideoOutCVideo)
-				{
-				GLX_LOG_INFO("TV is connected Capabilities Exist");
-				iTvOutConnectionState = ETrue;
-				break;
-				}
-			}
-		}
-	CleanupStack::PopAndDestroy(nameArray);
-	if (previousTvState != iTvOutConnectionState || previousHDMIState
-			!= iHDMIConnectionState)
 {
-GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueNotificationL -"
+TAccPolGenericID genId = iCurrentAccArray.GetGenericIDL(index);
-" TvConnectionStatusChanged");
+//  Get all supported capabilities for this connected accessory.
-GLX_LOG_INFO2("CurrentTvState = %d , CurrentHDMIState = %d",
+iTvAccCon.GetSubblockNameArrayL(genId, *nameArray);
-iTvOutConnectionState,iHDMIConnectionState);
+//  Check if this connected accessory supports TV-Out capabality.
-iConnectionObserver.HandleTvConnectionStatusChangedL();
+GLX_LOG_INFO1("CGlxTvConnectionMonitor::UpdateConnectionStatusL current index value is %d",index);
+if (nameArray->HasName(KAccVideoOut))
+{
+GLX_LOG_INFO("CGlxTvConnectionMonitor::UpdateConnectionStatusL Video Accessory Supported");
+TAccPolNameRecord nameRecord;
+nameRecord.SetNameL(KAccVideoOut);
+TAccValueTypeTInt value;
+iTvAccCon.GetValueL(genId, nameRecord, value);
+if (value.iValue == EAccVideoOutEHDMI)
+{
+GLX_LOG_INFO("CGlxTvConnectionMonitor::UpdateConnectionStatusL HDMI is connected");
+iHDMIConnectionState = ETrue;
+}
+else if (value.iValue == EAccVideoOutCVideo)
+{
+GLX_LOG_INFO("CGlxTvConnectionMonitor::UpdateConnectionStatusL TV is connected");
+iTvOutConnectionState = ETrue;
+}
+}
 }
-}
+CleanupStack::PopAndDestroy(nameArray);
+GLX_LOG_INFO2("CGlxTvConnectionMonitor::UpdateConnectionStatusL CurrentTvState = %d , CurrentHDMIState = %d",
+iTvOutConnectionState,iHDMIConnectionState);
+}

changeset 29	2c833fc9e98f
parent 26	c499df2dbb33
child 33	1ee2af37811f