--- a/photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp Tue Jan 26 11:58:28 2010 +0200
+++ b/photosgallery/viewframework/tvout/src/glxtvconnectionmonitor.cpp Tue Feb 02 00:10:37 2010 +0200
@@ -86,8 +86,9 @@
User::LeaveIfError( iTvAccServer.Connect() );
User::LeaveIfError( iTvAccMode.CreateSubSession( iTvAccServer ) );
User::LeaveIfError( iTvAccMode.GetAccessoryMode( iCurrentAccMode ) );
- iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut
- || iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
+ iTvOutConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut);
+ iHDMIConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
+
IssueRequest();
}
@@ -140,9 +141,19 @@
TBool CGlxTvConnectionMonitor::IsConnected() const
{
GLX_LOG_INFO("CGlxTvConnectionMonitor::IsConnected");
- return iConnectionState;
+ return iTvOutConnectionState;
}
+//-----------------------------------------------------------------------------
+// Is the TV out cable connected
+// IsConnected
+//-----------------------------------------------------------------------------
+//
+TBool CGlxTvConnectionMonitor::IsHDMIConnected() const
+ {
+ GLX_LOG_INFO("CGlxTvConnectionMonitor::IsHDMIConnected");
+ return iHDMIConnectionState;
+ }
//-----------------------------------------------------------------------------
// Request accessory server events
@@ -166,8 +177,8 @@
void CGlxTvConnectionMonitor::IssueNotificationL()
{
GLX_LOG_INFO("CGlxTvConnectionMonitor::IssueNotificationL");
- iConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut ||
- iCurrentAccMode.iAccessoryMode == EAccModeHDMI );
+ iTvOutConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeTVOut);
+ iHDMIConnectionState = ( iCurrentAccMode.iAccessoryMode == EAccModeHDMI);
iConnectionObserver.HandleTvConnectionStatusChangedL();
}