log: replace all NGLOG with LOG

This commit is contained in:
wwylele 2018-06-29 14:18:07 +03:00
parent fde415968e
commit 7c5a76e58b
152 changed files with 1541 additions and 1541 deletions

View file

@ -25,7 +25,7 @@ std::unique_ptr<CameraInterface> CreateCamera(const std::string& name, const std
}
if (name != "blank") {
NGLOG_ERROR(Service_CAM, "Unknown camera {}", name);
LOG_ERROR(Service_CAM, "Unknown camera {}", name);
}
return std::make_unique<BlankCamera>();
}
@ -39,7 +39,7 @@ std::unique_ptr<CameraInterface> CreateCameraPreview(const std::string& name,
}
if (name != "blank") {
NGLOG_ERROR(Service_CAM, "Unknown camera {}", name);
LOG_ERROR(Service_CAM, "Unknown camera {}", name);
}
return std::make_unique<BlankCamera>();
}

View file

@ -31,7 +31,7 @@ public:
* @param flip The image flip to apply
* @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 NGLOG_ERROR when error
* Implementations. For example, A dialog may be used instead of LOG_ERROR when error
* occurs.
*/
virtual std::unique_ptr<CameraInterface> CreatePreview(const std::string& config, int width,

View file

@ -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) {
NGLOG_ERROR(Input, "Factory {} already registered", name);
LOG_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) {
NGLOG_ERROR(Input, "Factory {} not registered", name);
LOG_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") {
NGLOG_ERROR(Input, "Unknown engine name: {}", engine);
LOG_ERROR(Input, "Unknown engine name: {}", engine);
}
return std::make_unique<InputDeviceType>();
}