diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h index ea9f10f1d7d43a6fc7460da9e6015402b1e4cb45..adc6cb99dcba89d692cc6dfa280c2d13e8b0ad8b 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h @@ -41,7 +41,7 @@ public: const std::string& value) override; private: - DCameraSourceHandler() = default; + DCameraSourceHandler(); ~DCameraSourceHandler(); private: @@ -58,4 +58,4 @@ __attribute__((visibility("default"))) IDistributedHardwareSource *GetSourceHard #endif } } -#endif \ No newline at end of file +#endif diff --git a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp index 5c22664a96bfa0aa8fca4adbd075f0cf8ed92fe8..9aeb4fa090b32a797f908760e22cca92634a0667 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_source/src/dcamera_source_handler.cpp @@ -26,6 +26,12 @@ namespace OHOS { namespace DistributedHardware { IMPLEMENT_SINGLE_INSTANCE(DCameraSourceHandler); +DCameraSourceHandler::DCameraSourceHandler() +{ + DHLOGI("DCameraSourceHandler construct."); + callback_ = new DCameraSourceCallback(); +} + DCameraSourceHandler::~DCameraSourceHandler() { DHLOGI("~DCameraSourceHandler"); @@ -41,11 +47,6 @@ int32_t DCameraSourceHandler::InitSource(const std::string& params) return DCAMERA_INIT_ERR; } - callback_ = new DCameraSourceCallback(); - if (callback_ == nullptr) { - DHLOGE("DCameraSourceHandler InitSource init callback failed"); - return DCAMERA_INIT_ERR; - } int32_t ret = dCameraSourceSrv->InitSource(params, callback_); DHLOGI("DCameraSourceHandler InitSource end, ret: %d", ret); return ret; @@ -123,4 +124,4 @@ IDistributedHardwareSource *GetSourceHardwareHandler() return &DCameraSourceHandler::GetInstance(); } } -} \ No newline at end of file +}