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

Side by Side Diff: media/audio/cras/cras_unified.h

Issue 1911913002: Convert //media/audio from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix cast + windows build 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // Creates a unified stream based on the cras (ChromeOS audio server) interface. 5 // Creates a unified stream based on the cras (ChromeOS audio server) interface.
6 // 6 //
7 // CrasUnifiedStream object is *not* thread-safe and should only be used 7 // CrasUnifiedStream object is *not* thread-safe and should only be used
8 // from the audio thread. 8 // from the audio thread.
9 9
10 #ifndef MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_ 10 #ifndef MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 // Volume level from 0.0 to 1.0. 99 // Volume level from 0.0 to 1.0.
100 float volume_; 100 float volume_;
101 101
102 // Audio manager that created us. Used to report that we've been closed. 102 // Audio manager that created us. Used to report that we've been closed.
103 AudioManagerCras* manager_; 103 AudioManagerCras* manager_;
104 104
105 // Callback to get audio samples. 105 // Callback to get audio samples.
106 AudioSourceCallback* source_callback_; 106 AudioSourceCallback* source_callback_;
107 107
108 // Container for exchanging data with AudioSourceCallback::OnMoreData(). 108 // Container for exchanging data with AudioSourceCallback::OnMoreData().
109 scoped_ptr<AudioBus> output_bus_; 109 std::unique_ptr<AudioBus> output_bus_;
danakj 2016/04/22 22:47:36 include memory
dcheng 2016/04/22 23:13:20 Done.
110 110
111 // Direciton of the stream. 111 // Direciton of the stream.
112 CRAS_STREAM_DIRECTION stream_direction_; 112 CRAS_STREAM_DIRECTION stream_direction_;
113 113
114 DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStream); 114 DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStream);
115 }; 115 };
116 116
117 } // namespace media 117 } // namespace media
118 118
119 #endif // MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_ 119 #endif // MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698