Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Side by Side Diff: components/audio_modem/audio_player_impl.h

Issue 1921973002: Convert //components/[a-e]* from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef COMPONENTS_AUDIO_MODEM_AUDIO_PLAYER_IMPL_H_ 5 #ifndef COMPONENTS_AUDIO_MODEM_AUDIO_PLAYER_IMPL_H_
6 #define COMPONENTS_AUDIO_MODEM_AUDIO_PLAYER_IMPL_H_ 6 #define COMPONENTS_AUDIO_MODEM_AUDIO_PLAYER_IMPL_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
10 #include <vector> 11 #include <vector>
11 12
12 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
16 #include "components/audio_modem/audio_player.h" 17 #include "components/audio_modem/audio_player.h"
17 #include "media/audio/audio_io.h" 18 #include "media/audio/audio_io.h"
18 19
19 namespace media { 20 namespace media {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 int OnMoreData(media::AudioBus* dest, 64 int OnMoreData(media::AudioBus* dest,
64 uint32_t total_bytes_delay, 65 uint32_t total_bytes_delay,
65 uint32_t frames_skipped) override; 66 uint32_t frames_skipped) override;
66 void OnError(media::AudioOutputStream* stream) override; 67 void OnError(media::AudioOutputStream* stream) override;
67 68
68 bool is_playing_; 69 bool is_playing_;
69 70
70 // Self-deleting object. 71 // Self-deleting object.
71 media::AudioOutputStream* stream_; 72 media::AudioOutputStream* stream_;
72 73
73 scoped_ptr<media::AudioOutputStream> output_stream_for_testing_; 74 std::unique_ptr<media::AudioOutputStream> output_stream_for_testing_;
74 75
75 // All fields below here are protected by this lock. 76 // All fields below here are protected by this lock.
76 base::Lock state_lock_; 77 base::Lock state_lock_;
77 78
78 scoped_refptr<media::AudioBusRefCounted> samples_; 79 scoped_refptr<media::AudioBusRefCounted> samples_;
79 80
80 // Index to the frame in the samples that we need to play next. 81 // Index to the frame in the samples that we need to play next.
81 int frame_index_; 82 int frame_index_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(AudioPlayerImpl); 84 DISALLOW_COPY_AND_ASSIGN(AudioPlayerImpl);
84 }; 85 };
85 86
86 } // namespace audio_modem 87 } // namespace audio_modem
87 88
88 #endif // COMPONENTS_AUDIO_MODEM_AUDIO_PLAYER_IMPL_H_ 89 #endif // COMPONENTS_AUDIO_MODEM_AUDIO_PLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « components/arc/test/fake_app_instance.h ('k') | components/audio_modem/audio_player_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698