openharmony/multimedia_camera_lite
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_camera_lite.git synced 2026-07-01 22:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

!92 【OpenHarmony开源贡献者计划2022】fixed CameraStauts to CameraStatus

Browse Source 
Merge pull request !92 from zhangpeng/fixed
This commit is contained in:
openharmony_ci
2022-06-15 01:19:21 +00:00
committed by Gitee
parent 1f3dd939a6 a8e730cb3d
commit caad4c7ae2
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/binder/src/camera_service_client.cpp
+2 -2
View File
@@ -266,8 +266,8 @@ int32_t CameraServiceClient::ServiceClientCallback(uint32_t code, IpcIo *data, I
case ON_CAMERA_STATUS_CHANGE: {
int status;
ReadInt32(data, &status);
CameraServiceCallback::CameraStauts cameraStatus =
static_cast<CameraServiceCallback::CameraStauts>(status);
CameraServiceCallback::CameraStatus cameraStatus =
static_cast<CameraServiceCallback::CameraStatus>(status);
string cameraId = para->cameraId;
client->cameraServiceCb_->OnCameraStatusChange(cameraId, cameraStatus);
break;
frameworks/camera_manager.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ public:
}
}
void OnCameraStatusChange(string &cameraId, CameraStauts status) override
void OnCameraStatusChange(string &cameraId, CameraStatus status) override
{
auto p = cameraMapCache_.find(cameraId);
switch (status) {
frameworks/camera_service_callback.h
+2 -2
View File
@@ -25,7 +25,7 @@ public:
CameraServiceCallback() = default;
~CameraServiceCallback() = default;
enum CameraStauts {
enum CameraStatus {
CAMERA_STATUS_AVAIL,
CAMERA_STATUS_UNAVAIL,
CAMERA_STATUS_CREATED,
@@ -33,7 +33,7 @@ public:
CAMERA_STATUS_CLOSE,
};
virtual void OnCameraServiceInitialized(std::list<std::string> &availCameraIdList) {}
virtual void OnCameraStatusChange(std::string &cameraId, CameraStauts status) {}
virtual void OnCameraStatusChange(std::string &cameraId, CameraStatus status) {}
};
} // namespace Media
} // namespace OHOS
frameworks/passthrough/src/camera_service_client.cpp
+2 -2
View File
@@ -70,8 +70,8 @@ int32_t CameraServiceClient::SetCameraMode(uint8_t modeIndex)
void CameraServiceClient::CreateCamera(string cameraId)
{
CameraServiceCallback::CameraStauts cameraStatus =
static_cast<CameraServiceCallback::CameraStauts>(cameraService_->CreateCamera(cameraId));
CameraServiceCallback::CameraStatus cameraStatus =
static_cast<CameraServiceCallback::CameraStatus>(cameraService_->CreateCamera(cameraId));
cameraServiceCb_->OnCameraStatusChange(cameraId, cameraStatus);
}
} // namespace Media