From aea4896e46f2c31efb7d144117a219826d9c7c79 Mon Sep 17 00:00:00 2001 From: Mu-Woong Lee Date: Thu, 30 Jun 2016 10:19:41 +0900 Subject: [PATCH] sensor: rename SensorProxy::start() and stop() to listen() and unlisten() start() and stop() are being used by logger classes with different meanings, thus it would be better to rename them to avoid ambiguity. Change-Id: Iaeb1aea86997f0659a768a31d88d47a371bda653 Signed-off-by: Mu-Woong Lee --- src/sensor/SensorProxy.cpp | 6 +++--- src/sensor/SensorProxy.h | 4 ++-- src/sensor/pedometer/PedometerLogger.cpp | 10 +++++----- src/sensor/pressure/PressureLogger.cpp | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/sensor/SensorProxy.cpp b/src/sensor/SensorProxy.cpp index f927ec1..98dd0a6 100644 --- a/src/sensor/SensorProxy.cpp +++ b/src/sensor/SensorProxy.cpp @@ -34,7 +34,7 @@ SensorProxy::SensorProxy() : SensorProxy::~SensorProxy() { - stop(); + unlisten(); } void SensorProxy::setSensor(sensor_type_t type) @@ -62,7 +62,7 @@ void SensorProxy::setUserData(void *data) userData = data; } -bool SensorProxy::start() +bool SensorProxy::listen() { _D("#Sensor = %#x", sensorType); @@ -90,7 +90,7 @@ bool SensorProxy::start() return true; } -void SensorProxy::stop() +void SensorProxy::unlisten() { IF_FAIL_VOID(sensorHandle >= 0); diff --git a/src/sensor/SensorProxy.h b/src/sensor/SensorProxy.h index ba60b35..7ae1c87 100644 --- a/src/sensor/SensorProxy.h +++ b/src/sensor/SensorProxy.h @@ -33,8 +33,8 @@ namespace ctx { void setBatchLatency(unsigned int latency); void setUserData(void *data); - virtual bool start(); - virtual void stop(); + bool listen(); + void unlisten(); bool isRunning(); void flush(); diff --git a/src/sensor/pedometer/PedometerLogger.cpp b/src/sensor/pedometer/PedometerLogger.cpp index c1103b6..c215d30 100644 --- a/src/sensor/pedometer/PedometerLogger.cpp +++ b/src/sensor/pedometer/PedometerLogger.cpp @@ -47,16 +47,15 @@ PedometerLogger::PedometerLogger() : PedometerLogger::~PedometerLogger() { + stop(); } bool PedometerLogger::start() { - if (SensorProxy::isRunning()) - return true; - + IF_FAIL_RETURN_TAG(!isRunning(), true, _D, "Started already"); _I(GREEN("Start to record")); - if (SensorProxy::start()) { + if (listen()) { flush(); return true; } @@ -66,9 +65,10 @@ bool PedometerLogger::start() void PedometerLogger::stop() { + IF_FAIL_VOID_TAG(isRunning(), _D, "Stopped already"); _I(GREEN("Stop recording")); - SensorProxy::stop(); + unlisten(); __firstEvent = true; } diff --git a/src/sensor/pressure/PressureLogger.cpp b/src/sensor/pressure/PressureLogger.cpp index 8f25f11..5f2f459 100644 --- a/src/sensor/pressure/PressureLogger.cpp +++ b/src/sensor/pressure/PressureLogger.cpp @@ -49,26 +49,26 @@ PressureLogger::PressureLogger() PressureLogger::~PressureLogger() { + stop(); } bool PressureLogger::start() { - if (SensorProxy::isRunning()) - return true; - + IF_FAIL_RETURN_TAG(!isRunning(), true, _D, "Started already"); _I(GREEN("Start to record")); __lastInsertionTime = TimeUtil::getTime(); __resetInsertionQuery(); - return SensorProxy::start(); + return listen(); } void PressureLogger::stop() { + IF_FAIL_VOID_TAG(isRunning(), _D, "Stopped already"); _I(GREEN("Stop recording")); - SensorProxy::stop(); + unlisten(); } void PressureLogger::onEvent(sensor_data_t *eventData) -- 2.34.1