OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromeos/accelerometer/accelerometer_reader.h" | 5 #include "chromeos/accelerometer/accelerometer_reader.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 // Asynchronously detect and initialize the accelerometer to avoid delaying | 195 // Asynchronously detect and initialize the accelerometer to avoid delaying |
196 // startup. | 196 // startup. |
197 base::PostTaskAndReplyWithResult( | 197 base::PostTaskAndReplyWithResult( |
198 task_runner_.get(), FROM_HERE, | 198 task_runner_.get(), FROM_HERE, |
199 base::Bind(&DetectAndReadAccelerometerConfiguration, configuration_), | 199 base::Bind(&DetectAndReadAccelerometerConfiguration, configuration_), |
200 base::Bind(&AccelerometerReader::OnInitialized, | 200 base::Bind(&AccelerometerReader::OnInitialized, |
201 weak_factory_.GetWeakPtr(), configuration_)); | 201 weak_factory_.GetWeakPtr(), configuration_)); |
202 } | 202 } |
203 | 203 |
204 void AccelerometerReader::AddObserver(Observer* observer) { | 204 void AccelerometerReader::AddObserver(Observer* observer) { |
205 observers_.AddObserver(observer); | 205 observers_->AddObserver(observer); |
206 if (has_update_) | 206 if (update_) |
207 observer->OnAccelerometerUpdated(update_); | 207 observer->OnAccelerometerUpdated(update_.get()); |
208 } | 208 } |
209 | 209 |
210 void AccelerometerReader::RemoveObserver(Observer* observer) { | 210 void AccelerometerReader::RemoveObserver(Observer* observer) { |
211 observers_.RemoveObserver(observer); | 211 observers_->RemoveObserver(observer); |
| 212 } |
| 213 |
| 214 bool AccelerometerReader::HasObserver(Observer* observer) { |
| 215 return observers_->HasObserver(observer); |
| 216 } |
| 217 |
| 218 int AccelerometerReader::DelayBetweenReadsMs() const { |
| 219 return kDelayBetweenReadsMs; |
212 } | 220 } |
213 | 221 |
214 AccelerometerReader::AccelerometerReader() | 222 AccelerometerReader::AccelerometerReader() |
215 : has_update_(false), | 223 : configuration_(new AccelerometerReader::Configuration()), |
216 configuration_(new AccelerometerReader::Configuration()), | 224 observers_(new ObserverListThreadSafe<Observer>()), |
217 weak_factory_(this) { | 225 weak_factory_(this) { |
218 } | 226 } |
219 | 227 |
220 AccelerometerReader::~AccelerometerReader() { | 228 AccelerometerReader::~AccelerometerReader() { |
221 } | 229 } |
222 | 230 |
223 void AccelerometerReader::OnInitialized( | 231 void AccelerometerReader::OnInitialized( |
224 scoped_refptr<AccelerometerReader::Configuration> configuration, | 232 scoped_refptr<AccelerometerReader::Configuration> configuration, |
225 bool success) { | 233 bool success) { |
226 if (success) | 234 if (success) |
(...skipping 13 matching lines...) Expand all Loading... |
240 weak_factory_.GetWeakPtr(), | 248 weak_factory_.GetWeakPtr(), |
241 reading)); | 249 reading)); |
242 } | 250 } |
243 | 251 |
244 void AccelerometerReader::OnDataRead( | 252 void AccelerometerReader::OnDataRead( |
245 scoped_refptr<AccelerometerReader::Reading> reading, | 253 scoped_refptr<AccelerometerReader::Reading> reading, |
246 bool success) { | 254 bool success) { |
247 DCHECK(!task_runner_->RunsTasksOnCurrentThread()); | 255 DCHECK(!task_runner_->RunsTasksOnCurrentThread()); |
248 | 256 |
249 if (success) { | 257 if (success) { |
250 has_update_ = true; | 258 update_ = new AccelerometerUpdate(); |
251 for (int i = 0; i < ACCELEROMETER_SOURCE_COUNT; ++i) { | 259 for (int i = 0; i < ACCELEROMETER_SOURCE_COUNT; ++i) { |
252 if (!configuration_->data.has[i]) | 260 if (!configuration_->data.has[i]) |
253 continue; | 261 continue; |
254 | 262 |
255 int16* values = reinterpret_cast<int16*>(reading->data); | 263 int16* values = reinterpret_cast<int16*>(reading->data); |
256 update_.Set(static_cast<AccelerometerSource>(i), | 264 update_->Set(static_cast<AccelerometerSource>(i), |
257 values[configuration_->data.index[i][0]] * | 265 values[configuration_->data.index[i][0]] * |
258 configuration_->data.scale[i][0], | 266 configuration_->data.scale[i][0], |
259 values[configuration_->data.index[i][1]] * | 267 values[configuration_->data.index[i][1]] * |
260 configuration_->data.scale[i][1], | 268 configuration_->data.scale[i][1], |
261 values[configuration_->data.index[i][2]] * | 269 values[configuration_->data.index[i][2]] * |
262 configuration_->data.scale[i][2]); | 270 configuration_->data.scale[i][2]); |
263 } | 271 } |
264 FOR_EACH_OBSERVER(Observer, observers_, OnAccelerometerUpdated(update_)); | 272 // TODO(jonross): move this to the blocking thread (crbug.com/461433) |
| 273 observers_->Notify(FROM_HERE, &Observer::OnAccelerometerUpdated, update_); |
265 } | 274 } |
266 | 275 |
267 // Trigger another read after the current sampling delay. | 276 // Trigger another read after the current sampling delay. |
268 base::MessageLoop::current()->PostDelayedTask( | 277 base::MessageLoop::current()->PostDelayedTask( |
269 FROM_HERE, | 278 FROM_HERE, |
270 base::Bind(&AccelerometerReader::TriggerRead, | 279 base::Bind(&AccelerometerReader::TriggerRead, |
271 weak_factory_.GetWeakPtr()), | 280 weak_factory_.GetWeakPtr()), |
272 base::TimeDelta::FromMilliseconds(kDelayBetweenReadsMs)); | 281 base::TimeDelta::FromMilliseconds(kDelayBetweenReadsMs)); |
273 } | 282 } |
274 | 283 |
275 } // namespace chromeos | 284 } // namespace chromeos |
OLD | NEW |