core/frontend: Replace logging macros
This commit is contained in:
parent
d81cacfb9e
commit
2865d23064
|
@ -24,7 +24,7 @@ std::unique_ptr<CameraInterface> CreateCamera(const std::string& name, const std
|
|||
}
|
||||
|
||||
if (name != "blank") {
|
||||
LOG_ERROR(Service_CAM, "Unknown camera \"%s\"", name.c_str());
|
||||
NGLOG_ERROR(Service_CAM, "Unknown camera \"{}\"", name);
|
||||
}
|
||||
return std::make_unique<BlankCamera>();
|
||||
}
|
||||
|
@ -38,7 +38,7 @@ std::unique_ptr<CameraInterface> CreateCameraPreview(const std::string& name,
|
|||
}
|
||||
|
||||
if (name != "blank") {
|
||||
LOG_ERROR(Service_CAM, "Unknown camera \"%s\"", name.c_str());
|
||||
NGLOG_ERROR(Service_CAM, "Unknown camera \"{}\"", name);
|
||||
}
|
||||
return std::make_unique<BlankCamera>();
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ public:
|
|||
* meaning of this string.
|
||||
* @returns a unique_ptr to the created camera object.
|
||||
* Note: The default implementation for this is to call Create(). Derived classes may have other
|
||||
* Implementations. For example, A dialog may be used instead of LOG_ERROR when error
|
||||
* Implementations. For example, A dialog may be used instead of NGLOG_ERROR when error
|
||||
* occurs.
|
||||
*/
|
||||
virtual std::unique_ptr<CameraInterface> CreatePreview(const std::string& config, int width,
|
||||
|
|
|
@ -59,7 +59,7 @@ template <typename InputDeviceType>
|
|||
void RegisterFactory(const std::string& name, std::shared_ptr<Factory<InputDeviceType>> factory) {
|
||||
auto pair = std::make_pair(name, std::move(factory));
|
||||
if (!Impl::FactoryList<InputDeviceType>::list.insert(std::move(pair)).second) {
|
||||
LOG_ERROR(Input, "Factory %s already registered", name.c_str());
|
||||
NGLOG_ERROR(Input, "Factory {} already registered", name);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -71,7 +71,7 @@ void RegisterFactory(const std::string& name, std::shared_ptr<Factory<InputDevic
|
|||
template <typename InputDeviceType>
|
||||
void UnregisterFactory(const std::string& name) {
|
||||
if (Impl::FactoryList<InputDeviceType>::list.erase(name) == 0) {
|
||||
LOG_ERROR(Input, "Factory %s not registered", name.c_str());
|
||||
NGLOG_ERROR(Input, "Factory {} not registered", name);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -88,7 +88,7 @@ std::unique_ptr<InputDeviceType> CreateDevice(const std::string& params) {
|
|||
const auto pair = factory_list.find(engine);
|
||||
if (pair == factory_list.end()) {
|
||||
if (engine != "null") {
|
||||
LOG_ERROR(Input, "Unknown engine name: %s", engine.c_str());
|
||||
NGLOG_ERROR(Input, "Unknown engine name: {}", engine);
|
||||
}
|
||||
return std::make_unique<InputDeviceType>();
|
||||
}
|
||||
|
|
Reference in New Issue