diff -r 924385140d98 -r c2c61fdca848 coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp --- a/coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp Tue Aug 31 15:24:25 2010 +0300 +++ b/coreapplicationuis/SysAp/Src/SysApAccessoryObserver.cpp Wed Sep 01 12:24:48 2010 +0100 @@ -20,8 +20,6 @@ #include "SysApAccessoryObserver.h" #include "SysAp.hrh" #include "SysApAppUi.h" -#include -#include #include // RDebug @@ -61,7 +59,6 @@ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::~CSysApAccessoryObserver") ) ); Cancel(); iAccessoryMode.CloseSubSession(); - iAccessoryConnection.CloseSubSession(); iAccessoryServer.Close(); } @@ -95,51 +92,9 @@ TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): iAccMode.iAccessoryMode=%d" ), iAccMode.iAccessoryMode ) ); iPreviousMode = iAccMode.iAccessoryMode; } - TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): trying RAccessoryConnection::CreateSubSession" ) ) ); - err = iAccessoryConnection.CreateSubSession( iAccessoryServer ); - if ( err == KErrNone ) - { - TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): connection to RAccessoryConnection established" ) ) ); - TAccPolGenericIDArray iAccGenericIDArray; - err = iAccessoryConnection.GetAccessoryConnectionStatus( iAccGenericIDArray ); - if ( err == KErrNone ) - { - TInt iIndex = 0; - TAccPolGenericID iAccGenericID = iAccGenericIDArray.GetGenericIDL( iIndex ); - TUint iPhysicalConnection = iAccGenericID.PhysicalConnectionCaps(); - if (iPhysicalConnection & KPCWired) - { - iPhysicalConnectionType = KPCWired; - } - else if (iPhysicalConnection & KPCBluetooth) - { - iPhysicalConnectionType = KPCBluetooth; - } - else if (iPhysicalConnection & KPCInfraRed) - { - iPhysicalConnectionType = KPCInfraRed; - } - else if (iPhysicalConnection & KPCUSB) - { - iPhysicalConnectionType = KPCUSB; - } - else if (iPhysicalConnection & KPCHDMI) - { - iPhysicalConnectionType = KPCHDMI; - } iAccessoryMode.NotifyAccessoryModeChanged( iStatus, iAccMode ); SetActive(); - } - else - { - TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): Error in Getting AccessoryConnectionStatus Error: %d " ),err ) ); - } - } - else - { - TRACES( RDebug::Print( _L("CSysApAccessoryObserver::ConstructL(): RAccessoryConnection::CreateSubSession - Error: %d" ), err ) ); - } } else { @@ -160,7 +115,6 @@ { TRACES( RDebug::Print( _L("CSysApAccessoryObserver::DoCancel()" ) ) ); iAccessoryMode.CancelNotifyAccessoryModeChanged(); - iAccessoryConnection.CancelGetAccessoryConnectionStatus(); } // ---------------------------------------------------------------------------- @@ -179,37 +133,7 @@ } else if ( iAccMode.iAccessoryMode != iPreviousMode ) // for filtering audio output change notifications { - TInt err( KErrNone ); - TAccPolGenericIDArray iAccGenericIDArray; - err = iAccessoryConnection.GetAccessoryConnectionStatus( iAccGenericIDArray ); - if ( err == KErrNone ) - { - TInt iIndex = 0; - TAccPolGenericID iAccGenericID = iAccGenericIDArray.GetGenericIDL( iIndex ); - TUint iPhysicalConnection = iAccGenericID.PhysicalConnectionCaps(); - if ( iPhysicalConnection & KPCWired ) - { - iPhysicalConnectionType = KPCWired; - } - else if ( iPhysicalConnection & KPCBluetooth ) - { - iPhysicalConnectionType = KPCBluetooth; - } - else if ( iPhysicalConnection & KPCInfraRed ) - { - iPhysicalConnectionType = KPCInfraRed; - } - else if ( iPhysicalConnection & KPCUSB ) - { - iPhysicalConnectionType = KPCUSB; - } - else if ( iPhysicalConnection & KPCHDMI ) - { - iPhysicalConnectionType = KPCHDMI; - } - } - TRACES( RDebug::Print( _L("CSysApAccessoryObserver::RunL: iAccessoryMode: %d, iPhysicalConnectionType: %d" ), iAccMode.iAccessoryMode,iPhysicalConnectionType ) ); - iSysApAppUi.HandleAccessoryConnectedL( iAccMode.iAccessoryMode,iPhysicalConnectionType ); + iSysApAppUi.HandleAccessoryConnectedL( iAccMode.iAccessoryMode ); } iPreviousMode = iAccMode.iAccessoryMode; @@ -244,14 +168,6 @@ return iAccMode.iAccessoryMode; } - -// ---------------------------------------------------------------------------- -// CSysApAccessoryObserver::GetAccessoryConnectionType() const -// ---------------------------------------------------------------------------- -TInt CSysApAccessoryObserver::GetAccessoryConnectionType() const - { - return iPhysicalConnectionType; - } // End of File