equal
deleted
inserted
replaced
22 #include "cradioaccessoryobserver.h" |
22 #include "cradioaccessoryobserver.h" |
23 #include "mradioheadseteventobserver.h" |
23 #include "mradioheadseteventobserver.h" |
24 #include "cradioenginelogger.h" |
24 #include "cradioenginelogger.h" |
25 |
25 |
26 #ifdef ASW_CORE_AUDIO_PLATFORM_VERSION // Nokia specific adaptation |
26 #ifdef ASW_CORE_AUDIO_PLATFORM_VERSION // Nokia specific adaptation |
27 #include <accpolpropgenericid.h> |
27 //#include <accpolpropgenericid.h> |
|
28 #include <AccPolGenericIdDefinitions.h> |
28 |
29 |
29 #ifndef __WINS__ |
30 #ifndef __WINS__ |
30 |
31 // See accpolpropgenericid.h definitions KPCNokiaAV == 0x20000, |
31 const TUint KPhysicalConnectionBitmask = KPCNokiaAV | KPCWired; |
32 // Forced to use hard coded value here to avoid including from epoc32/include/internal |
|
33 const TUint KPhysicalConnectionBitmask = 0x20000 | KPCWired; |
32 |
34 |
33 #else |
35 #else |
34 |
36 // See accpolpropgenericid.h definitions KPCNokiaAV == 0x20000, |
35 const TUint KPhysicalConnectionBitmask = 0x20000 | 0x1; |
37 // Forced to use hard coded value here to avoid including from epoc32/include/internal |
|
38 const TUint KPhysicalConnectionBitmask = 0x20000 | KPCWired; |
36 |
39 |
37 #endif // __WINS__ |
40 #endif // __WINS__ |
38 |
41 |
39 #else |
42 #else |
40 const TUint KPhysicalConnectionBitmask = KPCWired; |
43 const TUint KPhysicalConnectionBitmask = KPCWired; |
114 aOutputType = EAccAudioOutPutTypePrivate; |
117 aOutputType = EAccAudioOutPutTypePrivate; |
115 #else |
118 #else |
116 TBool accessoryFound = EFalse; |
119 TBool accessoryFound = EFalse; |
117 |
120 |
118 LOG_FORMAT( "Connected accessories count = %d", iAccPolGenIdArr.Count()); |
121 LOG_FORMAT( "Connected accessories count = %d", iAccPolGenIdArr.Count()); |
119 for ( TInt i = 0; i < iAccPolGenIdArr.Count() && !accessoryFound; i++ ) |
122 for ( TInt i = 0; i < iAccPolGenIdArr.Count() && !accessoryFound; ++i ) |
120 { |
123 { |
121 TAccPolGenericID accPolGenId = iAccPolGenIdArr.GetGenericIDL( i ); |
124 TAccPolGenericID accPolGenId = iAccPolGenIdArr.GetGenericIDL( i ); |
122 |
125 |
123 //Check if physical connection is of acceptable type |
126 //Check if physical connection is of acceptable type |
124 TUint32 physicalConnectionCaps = accPolGenId.PhysicalConnectionCaps(); |
127 TUint32 physicalConnectionCaps = accPolGenId.PhysicalConnectionCaps(); |
235 LOG_FORMAT( "- %d accessories added.", addedAccessories ); |
238 LOG_FORMAT( "- %d accessories added.", addedAccessories ); |
236 aNroChangedAccessories += addedAccessories; |
239 aNroChangedAccessories += addedAccessories; |
237 |
240 |
238 iSavedAccessories.Reset(); |
241 iSavedAccessories.Reset(); |
239 |
242 |
240 for ( TInt i = 0; i < iAccPolGenIdArr.Count(); i++ ) |
243 for ( TInt i = 0; i < iAccPolGenIdArr.Count(); ++i ) |
241 { |
244 { |
242 iSavedAccessories.AppendL( iAccPolGenIdArr.GetGenericIDL( i ) ); |
245 iSavedAccessories.AppendL( iAccPolGenIdArr.GetGenericIDL( i ) ); |
243 LOG_FORMAT( "- accessory in slot %d: %d", |
246 LOG_FORMAT( "- accessory in slot %d: %d", |
244 i, iAccPolGenIdArr.GetGenericIDL( i ).UniqueID() ); |
247 i, iAccPolGenIdArr.GetGenericIDL( i ).UniqueID() ); |
245 } |
248 } |
253 TInt CRadioAccessoryObserver::CountRemovedAccessoriesL() const |
256 TInt CRadioAccessoryObserver::CountRemovedAccessoriesL() const |
254 { |
257 { |
255 LEVEL2( LOG_METHOD_AUTO ); |
258 LEVEL2( LOG_METHOD_AUTO ); |
256 TInt removedAccessories( 0 ); |
259 TInt removedAccessories( 0 ); |
257 |
260 |
258 for ( TInt i = 0; i < iSavedAccessories.Count(); i++ ) |
261 for ( TInt i = 0; i < iSavedAccessories.Count(); ++i ) |
259 { |
262 { |
260 TAccPolGenericID savedAcc = iSavedAccessories[i]; |
263 TAccPolGenericID savedAcc = iSavedAccessories[i]; |
261 |
264 |
262 TUint32 physicalConnectionCaps = savedAcc.PhysicalConnectionCaps(); |
265 TUint32 physicalConnectionCaps = savedAcc.PhysicalConnectionCaps(); |
263 |
266 |
291 TInt CRadioAccessoryObserver::CountAddedAccessoriesL() const |
294 TInt CRadioAccessoryObserver::CountAddedAccessoriesL() const |
292 { |
295 { |
293 LEVEL2( LOG_METHOD_AUTO ); |
296 LEVEL2( LOG_METHOD_AUTO ); |
294 TInt addedAccessories( 0 ); |
297 TInt addedAccessories( 0 ); |
295 |
298 |
296 for ( TInt i = 0; i < iAccPolGenIdArr.Count(); i++ ) |
299 for ( TInt i = 0; i < iAccPolGenIdArr.Count(); ++i ) |
297 { |
300 { |
298 TAccPolGenericID freshAcc = iAccPolGenIdArr.GetGenericIDL( i ); |
301 TAccPolGenericID freshAcc = iAccPolGenIdArr.GetGenericIDL( i ); |
299 |
302 |
300 TUint32 physicalConnectionCaps = freshAcc.PhysicalConnectionCaps(); |
303 TUint32 physicalConnectionCaps = freshAcc.PhysicalConnectionCaps(); |
301 |
304 |