| Index: components/copresence/handlers/audio/audio_directive_list.cc
|
| diff --git a/components/copresence/handlers/audio/audio_directive_list.cc b/components/copresence/handlers/audio/audio_directive_list.cc
|
| deleted file mode 100644
|
| index c66b06809ad14c14c90774b2490131a3f7d33cd2..0000000000000000000000000000000000000000
|
| --- a/components/copresence/handlers/audio/audio_directive_list.cc
|
| +++ /dev/null
|
| @@ -1,93 +0,0 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "components/copresence/handlers/audio/audio_directive_list.h"
|
| -
|
| -#include <algorithm>
|
| -
|
| -#include "base/memory/ptr_util.h"
|
| -
|
| -namespace copresence {
|
| -
|
| -// Public functions.
|
| -
|
| -AudioDirective::AudioDirective() {}
|
| -
|
| -AudioDirective::AudioDirective(const std::string& op_id,
|
| - base::TimeTicks end_time,
|
| - const Directive& server_directive)
|
| - : op_id(op_id),
|
| - end_time(end_time),
|
| - server_directive(server_directive) {}
|
| -
|
| -AudioDirectiveList::AudioDirectiveList(
|
| - const scoped_refptr<TickClockRefCounted>& clock)
|
| - : clock_(clock) {}
|
| -
|
| -AudioDirectiveList::~AudioDirectiveList() {}
|
| -
|
| -void AudioDirectiveList::AddDirective(const std::string& op_id,
|
| - const Directive& server_directive) {
|
| - base::TimeTicks end_time = clock_->NowTicks() +
|
| - base::TimeDelta::FromMilliseconds(server_directive.ttl_millis());
|
| -
|
| - // If this op is already in the list, update it instead of adding it again.
|
| - auto it = FindDirectiveByOpId(op_id);
|
| - if (it != active_directives_.end()) {
|
| - it->end_time = end_time;
|
| - std::make_heap(active_directives_.begin(),
|
| - active_directives_.end(),
|
| - LatestFirstComparator());
|
| - return;
|
| - }
|
| -
|
| - active_directives_.push_back(
|
| - AudioDirective(op_id, end_time, server_directive));
|
| - std::push_heap(active_directives_.begin(),
|
| - active_directives_.end(),
|
| - LatestFirstComparator());
|
| -}
|
| -
|
| -void AudioDirectiveList::RemoveDirective(const std::string& op_id) {
|
| - auto it = FindDirectiveByOpId(op_id);
|
| - if (it != active_directives_.end())
|
| - active_directives_.erase(it);
|
| -
|
| - std::make_heap(active_directives_.begin(),
|
| - active_directives_.end(),
|
| - LatestFirstComparator());
|
| -}
|
| -
|
| -std::unique_ptr<AudioDirective> AudioDirectiveList::GetActiveDirective() {
|
| - // The top is always the instruction that is ending the latest.
|
| - // If that time has passed, all our previous instructions have expired too.
|
| - // So we clear the list.
|
| - if (active_directives_.empty() ||
|
| - active_directives_.front().end_time < clock_->NowTicks()) {
|
| - active_directives_.clear();
|
| - return std::unique_ptr<AudioDirective>();
|
| - }
|
| -
|
| - return base::WrapUnique(new AudioDirective(active_directives_.front()));
|
| -}
|
| -
|
| -const std::vector<AudioDirective>& AudioDirectiveList::directives() const {
|
| - return active_directives_;
|
| -}
|
| -
|
| -
|
| -// Private functions.
|
| -
|
| -std::vector<AudioDirective>::iterator AudioDirectiveList::FindDirectiveByOpId(
|
| - const std::string& op_id) {
|
| - for (auto it = active_directives_.begin();
|
| - it != active_directives_.end();
|
| - ++it) {
|
| - if (it->op_id == op_id)
|
| - return it;
|
| - }
|
| - return active_directives_.end();
|
| -}
|
| -
|
| -} // namespace copresence
|
|
|