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

Side by Side Diff: webrtc/modules/audio_device/audio_device_impl.h

Issue 1722083002: Replace scoped_ptr with unique_ptr in webrtc/modules/audio_device/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 10 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 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H 11 #ifndef WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H 12 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_IMPL_H
13 13
14 #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE) 14 #if defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE)
15 15
16 #include <memory>
17
16 #include "webrtc/base/checks.h" 18 #include "webrtc/base/checks.h"
17 #include "webrtc/base/scoped_ptr.h"
18 #include "webrtc/modules/audio_device/audio_device_buffer.h" 19 #include "webrtc/modules/audio_device/audio_device_buffer.h"
19 #include "webrtc/modules/audio_device/include/audio_device.h" 20 #include "webrtc/modules/audio_device/include/audio_device.h"
20 21
21 namespace webrtc { 22 namespace webrtc {
22 23
23 class AudioDeviceGeneric; 24 class AudioDeviceGeneric;
24 class AudioManager; 25 class AudioManager;
25 class CriticalSectionWrapper; 26 class CriticalSectionWrapper;
26 27
27 class AudioDeviceModuleImpl : public AudioDeviceModule { 28 class AudioDeviceModuleImpl : public AudioDeviceModule {
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 CriticalSectionWrapper& _critSect; 210 CriticalSectionWrapper& _critSect;
210 CriticalSectionWrapper& _critSectEventCb; 211 CriticalSectionWrapper& _critSectEventCb;
211 CriticalSectionWrapper& _critSectAudioCb; 212 CriticalSectionWrapper& _critSectAudioCb;
212 213
213 AudioDeviceObserver* _ptrCbAudioDeviceObserver; 214 AudioDeviceObserver* _ptrCbAudioDeviceObserver;
214 215
215 AudioDeviceGeneric* _ptrAudioDevice; 216 AudioDeviceGeneric* _ptrAudioDevice;
216 217
217 AudioDeviceBuffer _audioDeviceBuffer; 218 AudioDeviceBuffer _audioDeviceBuffer;
218 #if defined(WEBRTC_ANDROID) 219 #if defined(WEBRTC_ANDROID)
219 rtc::scoped_ptr<AudioManager> _audioManagerAndroid; 220 std::unique_ptr<AudioManager> _audioManagerAndroid;
220 #endif 221 #endif
221 int32_t _id; 222 int32_t _id;
222 AudioLayer _platformAudioLayer; 223 AudioLayer _platformAudioLayer;
223 int64_t _lastProcessTime; 224 int64_t _lastProcessTime;
224 PlatformType _platformType; 225 PlatformType _platformType;
225 bool _initialized; 226 bool _initialized;
226 mutable ErrorCode _lastError; 227 mutable ErrorCode _lastError;
227 }; 228 };
228 229
229 } // namespace webrtc 230 } // namespace webrtc
230 231
231 #endif // defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE) 232 #endif // defined(WEBRTC_INCLUDE_INTERNAL_AUDIO_DEVICE)
232 233
233 #endif // WEBRTC_MODULES_INTERFACE_AUDIO_DEVICE_IMPL_H_ 234 #endif // WEBRTC_MODULES_INTERFACE_AUDIO_DEVICE_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/android/opensles_player.h ('k') | webrtc/modules/audio_device/dummy/file_audio_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698