Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changed emitToDbus to emitData
  • Loading branch information
Lihan Guo committed Feb 21, 2011
1 parent bd27967 commit 56ec229
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 24 deletions.
4 changes: 2 additions & 2 deletions core/dataemitter.h
Expand Up @@ -53,13 +53,13 @@ class DataEmitter : public RingBufferReader<TYPE>
unsigned n;
while ((n = RingBufferReader<TYPE>::read(chunkSize_, chunk_))) {
for (unsigned i = 0; i < n; ++i) {
emitToDbus(chunk_[i]);
emitData(chunk_[i]);
}
}
}

protected:
virtual void emitToDbus(const TYPE& value) = 0;
virtual void emitData(const TYPE& value) = 0;

private:
Source<TYPE> source_;
Expand Down
1 change: 1 addition & 0 deletions debian/changelog
Expand Up @@ -9,6 +9,7 @@ sensord (0.6.39) unstable; urgency=low
* Fixed coverity defects.
* Improved sensorfw examples
* Changed DbusEmitter to DataEmitter
* Changed emitToDbus to emitData

[Timo Rongas]
* Prevent reading values from empty list in SysfsAdaptor
Expand Down
2 changes: 1 addition & 1 deletion examples/sensorplugin/samplesensor.cpp
Expand Up @@ -113,7 +113,7 @@ bool SampleSensorChannel::stop()
// Store the previous value for use by the accessor function, and
// push data towards clients (the data will be pushed to socket(s) by
// sensormanager).
void SampleSensorChannel::emitToDbus(const TimedUnsigned& value)
void SampleSensorChannel::emitData(const TimedUnsigned& value)
{
previousSample_ = value;
writeToClients((const void*)(&value), sizeof(TimedUnsigned));
Expand Down
2 changes: 1 addition & 1 deletion examples/sensorplugin/samplesensor.h
Expand Up @@ -99,7 +99,7 @@ public Q_SLOTS:
TimedUnsigned previousSample_;

// Function that takes care of pushing the data to clients
void emitToDbus(const TimedUnsigned& value);
void emitData(const TimedUnsigned& value);
};

#endif
2 changes: 1 addition & 1 deletion sensors/accelerometersensor/accelerometersensor.cpp
Expand Up @@ -106,7 +106,7 @@ bool AccelerometerSensorChannel::stop()
return true;
}

void AccelerometerSensorChannel::emitToDbus(const AccelerationData& value)
void AccelerometerSensorChannel::emitData(const AccelerationData& value)
{
previousSample_ = value;
writeToClients((const void*)(&value), sizeof(AccelerationData));
Expand Down
2 changes: 1 addition & 1 deletion sensors/accelerometersensor/accelerometersensor.h
Expand Up @@ -90,7 +90,7 @@ public Q_SLOTS:
RingBuffer<AccelerationData>* outputBuffer_;
AccelerationData previousSample_;

void emitToDbus(const AccelerationData& value);
void emitData(const AccelerationData& value);
};

#endif
2 changes: 1 addition & 1 deletion sensors/alssensor/alssensor.cpp
Expand Up @@ -129,7 +129,7 @@ bool ALSSensorChannel::stop()
return true;
}

void ALSSensorChannel::emitToDbus(const TimedUnsigned& value)
void ALSSensorChannel::emitData(const TimedUnsigned& value)
{
if (value.value_ != previousValue_.value_) {
previousValue_.value_ = value.value_;
Expand Down
2 changes: 1 addition & 1 deletion sensors/alssensor/alssensor.h
Expand Up @@ -98,7 +98,7 @@ public Q_SLOTS:
BufferReader<TimedUnsigned>* alsReader_;
RingBuffer<TimedUnsigned>* outputBuffer_;

void emitToDbus(const TimedUnsigned& value);
void emitData(const TimedUnsigned& value);

#ifdef PROVIDE_CONTEXT_INFO
ContextProvider::Service service;
Expand Down
2 changes: 1 addition & 1 deletion sensors/compasssensor/compasssensor.cpp
Expand Up @@ -134,7 +134,7 @@ bool CompassSensorChannel::stop()
return true;
}

void CompassSensorChannel::emitToDbus(const CompassData& value)
void CompassSensorChannel::emitData(const CompassData& value)
{
compassData.timestamp_ = value.timestamp_;
compassData.level_ = value.level_;
Expand Down
2 changes: 1 addition & 1 deletion sensors/compasssensor/compasssensor.h
Expand Up @@ -94,7 +94,7 @@ public Q_SLOTS:
BufferReader<CompassData>* inputReader_;
RingBuffer<CompassData>* outputBuffer_;

void emitToDbus(const CompassData& value);
void emitData(const CompassData& value);
};

#endif
2 changes: 1 addition & 1 deletion sensors/gyroscopesensor/gyroscopesensor.cpp
Expand Up @@ -106,7 +106,7 @@ bool GyroscopeSensorChannel::stop()
return true;
}

void GyroscopeSensorChannel::emitToDbus(const AngularVelocityData& value)
void GyroscopeSensorChannel::emitData(const AngularVelocityData& value)
{
previousSample_ = value;
writeToClients((const void*)(&value), sizeof(AngularVelocityData));
Expand Down
2 changes: 1 addition & 1 deletion sensors/gyroscopesensor/gyroscopesensor.h
Expand Up @@ -83,7 +83,7 @@ public Q_SLOTS:

AngularVelocityData previousSample_;

void emitToDbus(const AngularVelocityData& value);
void emitData(const AngularVelocityData& value);
};

#endif // GYROSCOPE_SENSOR_CHANNEL_H
2 changes: 1 addition & 1 deletion sensors/magnetometersensor/magnetometersensor.cpp
Expand Up @@ -140,7 +140,7 @@ bool MagnetometerSensorChannel::stop()
return true;
}

void MagnetometerSensorChannel::emitToDbus(const CalibratedMagneticFieldData& value)
void MagnetometerSensorChannel::emitData(const CalibratedMagneticFieldData& value)
{
prevMeasurement_ = value;
writeToClients((const void*)(&value), sizeof(CalibratedMagneticFieldData));
Expand Down
2 changes: 1 addition & 1 deletion sensors/magnetometersensor/magnetometersensor.h
Expand Up @@ -96,7 +96,7 @@ public Q_SLOTS:
CalibratedMagneticFieldData prevMeasurement_;
int scaleCoefficient_;

void emitToDbus(const CalibratedMagneticFieldData& value);
void emitData(const CalibratedMagneticFieldData& value);
};

#endif // MAGNETOMETER_SENSOR_CHANNEL_H
2 changes: 1 addition & 1 deletion sensors/orientationsensor/orientationsensor.cpp
Expand Up @@ -107,7 +107,7 @@ bool OrientationSensorChannel::stop()
return true;
}

void OrientationSensorChannel::emitToDbus(const PoseData& value)
void OrientationSensorChannel::emitData(const PoseData& value)
{
if ((value.orientation_ != prevOrientation.orientation_) &&
(value.orientation_ != PoseData::Undefined) ) {
Expand Down
2 changes: 1 addition & 1 deletion sensors/orientationsensor/orientationsensor.h
Expand Up @@ -107,7 +107,7 @@ public Q_SLOTS:
* Emits new device orientation through DBus.
* @param value Orientation value to emit.
*/
void emitToDbus(const PoseData& value);
void emitData(const PoseData& value);
};

#endif // ORIENTATION_SENSOR_CHANNEL_H
2 changes: 1 addition & 1 deletion sensors/proximitysensor/proximitysensor.cpp
Expand Up @@ -106,7 +106,7 @@ bool ProximitySensorChannel::stop()
return true;
}

void ProximitySensorChannel::emitToDbus(const TimedUnsigned& value)
void ProximitySensorChannel::emitData(const TimedUnsigned& value)
{
previousValue_.timestamp_ = value.timestamp_;

Expand Down
2 changes: 1 addition & 1 deletion sensors/proximitysensor/proximitysensor.h
Expand Up @@ -90,7 +90,7 @@ public Q_SLOTS:
RingBuffer<TimedUnsigned>* outputBuffer_;
TimedUnsigned previousValue_;

void emitToDbus(const TimedUnsigned& value);
void emitData(const TimedUnsigned& value);
};

#endif // PROXIMITY_SENSOR_CHANNEL_H
2 changes: 1 addition & 1 deletion sensors/rotationsensor/rotationsensor.cpp
Expand Up @@ -157,7 +157,7 @@ bool RotationSensorChannel::stop()
return true;
}

void RotationSensorChannel::emitToDbus(const TimedXyzData& value)
void RotationSensorChannel::emitData(const TimedXyzData& value)
{
prevRotation_ = value;
writeToClients((const void*)(&value), sizeof(TimedXyzData));
Expand Down
2 changes: 1 addition & 1 deletion sensors/rotationsensor/rotationsensor.h
Expand Up @@ -100,7 +100,7 @@ public Q_SLOTS:
TimedXyzData prevRotation_;
bool hasZ_;

void emitToDbus(const TimedXyzData& value);
void emitData(const TimedXyzData& value);
};

#endif // ROTATION_SENSOR_CHANNEL_H
2 changes: 1 addition & 1 deletion sensors/tapsensor/tapsensor.cpp
Expand Up @@ -106,7 +106,7 @@ bool TapSensorChannel::stop()
return true;
}

void TapSensorChannel::emitToDbus(const TapData& tapData)
void TapSensorChannel::emitData(const TapData& tapData)
{
writeToClients((const void *)&tapData, sizeof(TapData));
}
2 changes: 1 addition & 1 deletion sensors/tapsensor/tapsensor.h
Expand Up @@ -89,7 +89,7 @@ public Q_SLOTS:
BufferReader<TapData>* tapReader_;
RingBuffer<TapData>* outputBuffer_;

void emitToDbus(const TapData& tapData);
void emitData(const TapData& tapData);
};

#endif // TAP_SENSOR_CHANNEL_H
4 changes: 2 additions & 2 deletions tests/filters/filtertests.cpp
Expand Up @@ -100,7 +100,7 @@ class DummyAdaptor : public Pusher
/**
* DummyDataEmitter is a DataEmitter that can be used to capture output data of
* a filter for testing purposes. The expected output data is given through a
* function, and is compared to actual received output in \c emitToDbus() function.
* function, and is compared to actual received output in \c emitData() function.
*/
template <class TYPE>
class DummyDataEmitter : public DataEmitter<TYPE> {
Expand All @@ -120,7 +120,7 @@ class DummyDataEmitter : public DataEmitter<TYPE> {
}
int numSamplesReceived() { return samplesReceived_; }

void emitToDbus(const TYPE& data) {
void emitData(const TYPE& data) {
index_++;
samplesReceived_++;

Expand Down

0 comments on commit 56ec229

Please sign in to comment.