diff -r ccb4f6b3db21 -r 8cb079868133 accessoryservices/accessoryserver/tsrc/public/basic/Stubs/AsyStub/src/AsyStubService.cpp --- a/accessoryservices/accessoryserver/tsrc/public/basic/Stubs/AsyStub/src/AsyStubService.cpp Tue Aug 31 16:29:05 2010 +0300 +++ b/accessoryservices/accessoryserver/tsrc/public/basic/Stubs/AsyStub/src/AsyStubService.cpp Wed Sep 01 12:34:26 2010 +0100 @@ -27,10 +27,6 @@ #include #include #include -#include -#ifdef FF_AUTOMOTIVESTACK -#include -#endif // ---------------------------------------------------------------------------------- // CASYStubService::CASYStubService() @@ -127,10 +123,6 @@ break; case ETFAsyConnOpenCable: - { - } - break; -// case ETFAsyConnOpenCable: case ETFAsyConnectOpenCable3Poles: { TRequestStatus status; @@ -148,7 +140,7 @@ TBuf HWModelID( _L("opencable")); //Set GenericID header - iGenericIDHeader.iAccessoryDeviceType = KDTHeadset; + iGenericIDHeader.iAccessoryDeviceType = KDTAVDevice; iGenericIDHeader.iPhysicalConnection = KPCWired; iGenericIDHeader.iApplicationProtocol = 0x0; @@ -178,7 +170,7 @@ nameValueArray ); nameValueArray.Close(); - iAccessoryControl.ConnectAccessory( status, genericID, EFalse ); + iAccessoryControl.ConnectAccessory( status, genericID, ETrue ); User::WaitForRequest( status ); TInt retval = status.Int(); @@ -319,7 +311,7 @@ nameValueArray ); nameValueArray.Close(); - iAccessoryControl.ConnectAccessory( status, genericID, EFalse ); + iAccessoryControl.ConnectAccessory( status, genericID, ETrue ); User::WaitForRequest( status ); TInt retval = status.Int(); @@ -385,7 +377,7 @@ nameValueArray ); nameValueArray.Close(); - iAccessoryControl.ConnectAccessory( status, genericID, EFalse ); + iAccessoryControl.ConnectAccessory( status, genericID, ETrue ); User::WaitForRequest( status ); TInt retval = status.Int(); @@ -854,20 +846,6 @@ break; } -#ifdef FF_AUTOMOTIVESTACK - case ETFAsyRTPStreamingConn: - { - RProperty property; - CleanupClosePushL ( property ); - COMPONENT_TRACE( ( _L( "ASYSTUB - CTFTestControlObserver::Service - Attaching to RTP streaming key" ) ) ); - User::LeaveIfError ( property.Attach ( KPSUidAccessoryServices, KPSAutoKeyRTPStreamingConnectionStatus ) ); - COMPONENT_TRACE( ( _L( "ASYSTUB - CTFTestControlObserver::Service - publishing to RTP streaming key" ) ) ); - User::LeaveIfError ( property.Set ( aParam1 ) ); - CleanupStack::PopAndDestroy (); // property - } - break; -#endif - default: COMPONENT_TRACE( ( _L( "ASYSTUB - CASYStubService::Service - Subscribe destination is WIRELESS ASY" ) ) );