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_.get()) |
flackr
2015/03/02 15:46:39
I believe scoped_refptr is testable (i.e. can just
jonross
2015/03/04 21:54:50
Done.
| |
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); | |
212 } | 216 } |
213 | 217 |
214 AccelerometerReader::AccelerometerReader() | 218 AccelerometerReader::AccelerometerReader() |
215 : has_update_(false), | 219 : configuration_(new AccelerometerReader::Configuration()), |
216 configuration_(new AccelerometerReader::Configuration()), | 220 observers_(new ObserverListThreadSafe<Observer>()), |
217 weak_factory_(this) { | 221 weak_factory_(this) { |
218 } | 222 } |
219 | 223 |
220 AccelerometerReader::~AccelerometerReader() { | 224 AccelerometerReader::~AccelerometerReader() { |
221 } | 225 } |
222 | 226 |
223 void AccelerometerReader::OnInitialized( | 227 void AccelerometerReader::OnInitialized( |
224 scoped_refptr<AccelerometerReader::Configuration> configuration, | 228 scoped_refptr<AccelerometerReader::Configuration> configuration, |
225 bool success) { | 229 bool success) { |
226 if (success) | 230 if (success) |
(...skipping 13 matching lines...) Expand all Loading... | |
240 weak_factory_.GetWeakPtr(), | 244 weak_factory_.GetWeakPtr(), |
241 reading)); | 245 reading)); |
242 } | 246 } |
243 | 247 |
244 void AccelerometerReader::OnDataRead( | 248 void AccelerometerReader::OnDataRead( |
245 scoped_refptr<AccelerometerReader::Reading> reading, | 249 scoped_refptr<AccelerometerReader::Reading> reading, |
246 bool success) { | 250 bool success) { |
247 DCHECK(!task_runner_->RunsTasksOnCurrentThread()); | 251 DCHECK(!task_runner_->RunsTasksOnCurrentThread()); |
248 | 252 |
249 if (success) { | 253 if (success) { |
250 has_update_ = true; | 254 update_ = new AccelerometerUpdate(); |
251 for (int i = 0; i < ACCELEROMETER_SOURCE_COUNT; ++i) { | 255 for (int i = 0; i < ACCELEROMETER_SOURCE_COUNT; ++i) { |
252 if (!configuration_->data.has[i]) | 256 if (!configuration_->data.has[i]) |
253 continue; | 257 continue; |
254 | 258 |
255 int16* values = reinterpret_cast<int16*>(reading->data); | 259 int16* values = reinterpret_cast<int16*>(reading->data); |
256 update_.Set(static_cast<AccelerometerSource>(i), | 260 update_->Set(static_cast<AccelerometerSource>(i), |
257 values[configuration_->data.index[i][0]] * | 261 values[configuration_->data.index[i][0]] * |
258 configuration_->data.scale[i][0], | 262 configuration_->data.scale[i][0], |
259 values[configuration_->data.index[i][1]] * | 263 values[configuration_->data.index[i][1]] * |
260 configuration_->data.scale[i][1], | 264 configuration_->data.scale[i][1], |
261 values[configuration_->data.index[i][2]] * | 265 values[configuration_->data.index[i][2]] * |
262 configuration_->data.scale[i][2]); | 266 configuration_->data.scale[i][2]); |
263 } | 267 } |
264 FOR_EACH_OBSERVER(Observer, observers_, OnAccelerometerUpdated(update_)); | 268 // TODO(jonross): move this to the blocking thread (crbug.com/461433) |
269 observers_->Notify(FROM_HERE, &Observer::OnAccelerometerUpdated, update_); | |
265 } | 270 } |
266 | 271 |
267 // Trigger another read after the current sampling delay. | 272 // Trigger another read after the current sampling delay. |
268 base::MessageLoop::current()->PostDelayedTask( | 273 base::MessageLoop::current()->PostDelayedTask( |
269 FROM_HERE, | 274 FROM_HERE, |
270 base::Bind(&AccelerometerReader::TriggerRead, | 275 base::Bind(&AccelerometerReader::TriggerRead, |
271 weak_factory_.GetWeakPtr()), | 276 weak_factory_.GetWeakPtr()), |
272 base::TimeDelta::FromMilliseconds(kDelayBetweenReadsMs)); | 277 base::TimeDelta::FromMilliseconds(kDelayBetweenReadsMs)); |
273 } | 278 } |
274 | 279 |
275 } // namespace chromeos | 280 } // namespace chromeos |
OLD | NEW |