Chromium Code Reviews Chromium Code Reviews
Issue 1911913002:
Convert //media/audio from scoped_ptr to std::unique_ptr (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ | 5 #ifndef MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ |
| 6 #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ | 6 #define MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ |
| 7 | 7 |
| 8 #include <cras_client.h> | 8 #include <cras_client.h> |
| 9 #include <stddef.h> | 9 #include <stddef.h> |
| 10 #include <stdint.h> | 10 #include <stdint.h> |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 103 | 103 |
| 104 // Direction of the stream. | 104 // Direction of the stream. |
| 105 const CRAS_STREAM_DIRECTION stream_direction_; | 105 const CRAS_STREAM_DIRECTION stream_direction_; |
| 106 | 106 |
| 107 // Index of the CRAS device to stream input from. | 107 // Index of the CRAS device to stream input from. |
| 108 int pin_device_; | 108 int pin_device_; |
| 109 | 109 |
| 110 // True if the stream is a system-wide loopback stream. | 110 // True if the stream is a system-wide loopback stream. |
| 111 bool is_loopback_; | 111 bool is_loopback_; |
| 112 | 112 |
| 113 scoped_ptr<AudioBus> audio_bus_; | 113 std::unique_ptr<AudioBus> audio_bus_; |
|
danakj
2016/04/22 22:47:36
include memory
dcheng
2016/04/22 23:13:20
Done.
| |
| 114 | 114 |
| 115 DISALLOW_COPY_AND_ASSIGN(CrasInputStream); | 115 DISALLOW_COPY_AND_ASSIGN(CrasInputStream); |
| 116 }; | 116 }; |
| 117 | 117 |
| 118 } // namespace media | 118 } // namespace media |
| 119 | 119 |
| 120 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ | 120 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ |
| OLD | NEW |
