equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). |
2 * Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * All rights reserved. |
3 * All rights reserved. |
4 * This component and the accompanying materials are made available |
4 * This component and the accompanying materials are made available |
5 * under the terms of "Eclipse Public License v1.0" |
5 * under the terms of "Eclipse Public License v1.0" |
6 * which accompanies this distribution, and is available |
6 * which accompanies this distribution, and is available |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
15 * |
15 * |
16 */ |
16 */ |
17 #include "cxecameradevicecontrolsymbian.h" |
17 #include "cxecameradevicecontrolsymbian.h" |
18 #include "cxesettingsimp.h" |
18 #include "cxesettingsimp.h" |
19 #include "cxefeaturemanagerimp.h" |
19 #include "cxefeaturemanagerimp.h" |
20 #include "cxesettingsmodel.h" |
|
21 #include "cxutils.h" |
20 #include "cxutils.h" |
22 #include "cxenamespace.h" |
21 #include "cxenamespace.h" |
23 #include "cxeerrormappingsymbian.h" |
22 #include "cxeerrormappingsymbian.h" |
24 #include "cxestate.h" |
23 #include "cxestate.h" |
25 |
24 |
80 |
79 |
81 CX_DEBUG_ASSERT(mCameraDevice && mCameraDevice->camera()); |
80 CX_DEBUG_ASSERT(mCameraDevice && mCameraDevice->camera()); |
82 |
81 |
83 if (state() == Idle) { |
82 if (state() == Idle) { |
84 setState(Initializing); |
83 setState(Initializing); |
85 mCameraDevice->camera()->Reserve(); |
84 mCameraDevice->reserveCamera(); |
86 OstTrace0(camerax_performance, CXECAMERADEVICECONTROLSYMBIAN_RESERVE, "msg: e_CX_RESERVE 1"); |
85 OstTrace0(camerax_performance, CXECAMERADEVICECONTROLSYMBIAN_RESERVE, "msg: e_CX_RESERVE 1"); |
87 } else if (state() == PendingRelease) { |
86 } else if (state() == PendingRelease) { |
88 // if we get a reserve request and if there is a pending release |
87 // if we get a reserve request and if there is a pending release |
89 // it is just fine to continue the init operation. |
88 // it is just fine to continue the init operation. |
90 setState(Initializing); |
89 setState(Initializing); |