equal
deleted
inserted
replaced
19 #include <remconaddress.h> |
19 #include <remconaddress.h> |
20 #include <remconbeareravrcp.h> // KRemConBearerAvrcpImplementationUid = 0x1020685f |
20 #include <remconbeareravrcp.h> // KRemConBearerAvrcpImplementationUid = 0x1020685f |
21 #include <btaccObserver.h> |
21 #include <btaccObserver.h> |
22 #include <remconinterfaceselector.h> |
22 #include <remconinterfaceselector.h> |
23 #include <remconaddress.h> |
23 #include <remconaddress.h> |
|
24 #include <remconcoreapitarget.h> |
24 #include <apacmdln.h> |
25 #include <apacmdln.h> |
25 #include <apgcli.h> |
26 #include <apgcli.h> |
26 #include "btaudioremconpskeys.h" |
27 #include "btaudioremconpskeys.h" |
27 #include "btrccLegacyVolumeLevelController.h" |
28 #include "btrccLegacyVolumeLevelController.h" |
28 #include "btrccAbsoluteVolumeLevelController.h" |
29 #include "btrccAbsoluteVolumeLevelController.h" |
29 #include "btrccLinker.h" |
30 #include "btrccLinker.h" |
|
31 #include "btrccplayerstarter.h" |
30 #include "btrccBrowsingAdapter.h" |
32 #include "btrccBrowsingAdapter.h" |
31 #include "debug.h" |
33 #include "debug.h" |
32 #include <btnotif.h> |
34 #include <btnotif.h> |
33 #include <mmf/server/sounddevice.h> |
35 #include <mmf/server/sounddevice.h> |
34 |
36 |
118 else |
120 else |
119 { |
121 { |
120 // If volume control is not supported, we'll need another interface selector session for disconnecting. |
122 // If volume control is not supported, we'll need another interface selector session for disconnecting. |
121 iInterfaceSelectorForDisconnectingTargetSession = CRemConInterfaceSelector::NewL(); |
123 iInterfaceSelectorForDisconnectingTargetSession = CRemConInterfaceSelector::NewL(); |
122 } |
124 } |
|
125 |
|
126 iPlayerStarter = CPlayerStarter::NewL(); |
|
127 iCoreTarget = CRemConCoreApiTarget::NewL(*iInterfaceSelector, *iPlayerStarter); |
|
128 iPlayerStarter->SetCoreTarget(*iCoreTarget); |
123 |
129 |
124 iRemConBatteryTgt = CRemConBatteryApiTarget::NewL(*iInterfaceSelector, *this); |
130 iRemConBatteryTgt = CRemConBatteryApiTarget::NewL(*iInterfaceSelector, *this); |
125 |
131 |
126 if (iAbsoluteVolController || iLegacyVolController) |
132 if (iAbsoluteVolController || iLegacyVolController) |
127 { |
133 { |
148 if (iClientRequest) |
154 if (iClientRequest) |
149 User::RequestComplete(iClientRequest, KErrAbort); |
155 User::RequestComplete(iClientRequest, KErrAbort); |
150 |
156 |
151 delete iAbsoluteVolController; |
157 delete iAbsoluteVolController; |
152 delete iLegacyVolController; |
158 delete iLegacyVolController; |
|
159 delete iPlayerStarter; |
153 Cancel(); |
160 Cancel(); |
154 iStateArray.ResetAndDestroy(); |
161 iStateArray.ResetAndDestroy(); |
155 iStateArray.Close(); |
162 iStateArray.Close(); |
156 delete iInterfaceSelector; |
163 delete iInterfaceSelector; |
157 delete iInterfaceSelectorForDisconnectingTargetSession; |
164 delete iInterfaceSelectorForDisconnectingTargetSession; |