equal
deleted
inserted
replaced
17 |
17 |
18 |
18 |
19 // INCLUDE FILES |
19 // INCLUDE FILES |
20 |
20 |
21 #include "btmcphonestatus.h" |
21 #include "btmcphonestatus.h" |
|
22 #ifdef NO101APPDEPFIXES |
22 #include <nssvascoreconstant.h> |
23 #include <nssvascoreconstant.h> |
|
24 #endif //NO101APPDEPFIXES |
23 #include <etelmm.h> |
25 #include <etelmm.h> |
24 #include "atcodec.h" |
26 #include "atcodec.h" |
25 #include "btmcprotocol.h" |
27 #include "btmcprotocol.h" |
26 #include "btmcprotocolstatus.h" |
28 #include "btmcprotocolstatus.h" |
27 #include "btmc_defs.h" |
29 #include "btmc_defs.h" |
98 { |
100 { |
99 TRACE_FUNC_ENTRY |
101 TRACE_FUNC_ENTRY |
100 if (aEnabled && !iVoiceRecognitionEnabled) |
102 if (aEnabled && !iVoiceRecognitionEnabled) |
101 { |
103 { |
102 // AO for Voice Dial |
104 // AO for Voice Dial |
|
105 #ifdef NO101APPDEPFIXES |
103 LEAVE_IF_ERROR(iVoiceDialProperty.Attach(KSINDUID, ERecognitionState)) |
106 LEAVE_IF_ERROR(iVoiceDialProperty.Attach(KSINDUID, ERecognitionState)) |
|
107 #else //NO101APPDEPFIXES |
|
108 LEAVE_IF_ERROR(iVoiceDialProperty.Attach(KUidSystemCategory, KBTMonoVoiceRecognitionStateKey)) |
|
109 #endif //NO101APPDEPFIXES |
104 CBtmcActive* ao = CBtmcActive::NewLC(*this, CActive::EPriorityStandard, KVoiceDialSubscribe); |
110 CBtmcActive* ao = CBtmcActive::NewLC(*this, CActive::EPriorityStandard, KVoiceDialSubscribe); |
105 iActives.AppendL(ao); |
111 iActives.AppendL(ao); |
106 iVoiceDialProperty.Subscribe(ao->iStatus); |
112 iVoiceDialProperty.Subscribe(ao->iStatus); |
107 ao->GoActive(); |
113 ao->GoActive(); |
108 CleanupStack::Pop(ao); |
114 CleanupStack::Pop(ao); |
205 { |
211 { |
206 TRACE_FUNC_ENTRY |
212 TRACE_FUNC_ENTRY |
207 TRACE_INFO((_L("Voice dial Initiator %d, Voice dial event %d"), iVoiceRecogInitiator, aEnabled)) |
213 TRACE_INFO((_L("Voice dial Initiator %d, Voice dial event %d"), iVoiceRecogInitiator, aEnabled)) |
208 TBTMonoATVoiceRecognition value = EBTMonoATVoiceRecognitionOff; |
214 TBTMonoATVoiceRecognition value = EBTMonoATVoiceRecognitionOff; |
209 |
215 |
|
216 #ifdef NO101APPDEPFIXES |
210 if (iVoiceRecogInitiator != EBTMonoVoiceRecognitionActivatedByRemote && aEnabled == ERecognitionStarted) |
217 if (iVoiceRecogInitiator != EBTMonoVoiceRecognitionActivatedByRemote && aEnabled == ERecognitionStarted) |
|
218 #else //NO101APPDEPFIXES |
|
219 if (iVoiceRecogInitiator != EBTMonoVoiceRecognitionActivatedByRemote && aEnabled == KBTMonoVoiceRecognitionStarted) |
|
220 #endif //NO101APPDEPFIXES |
211 {// phone activated or headset deactivated voice recognition, informs headset status change |
221 {// phone activated or headset deactivated voice recognition, informs headset status change |
212 value = EBTMonoATVoiceRecognitionOn; |
222 value = EBTMonoATVoiceRecognitionOn; |
213 } |
223 } |
214 else if(aEnabled == KErrNotFound) |
224 else if(aEnabled == KErrNotFound) |
215 {// headset or phone ui deactivated voice recognition, inform headset status change |
225 {// headset or phone ui deactivated voice recognition, inform headset status change |