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

Side by Side Diff: media/audio/win/wavein_input_win.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: . 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
« no previous file with comments | « media/audio/win/core_audio_util_win_unittest.cc ('k') | media/audio/win/waveout_output_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_WIN_WAVEIN_INPUT_WIN_H_ 5 #ifndef MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_
6 #define MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_ 6 #define MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_
7 7
8 #include <string>
9
10 #include <windows.h> 8 #include <windows.h>
11 #include <mmsystem.h> 9 #include <mmsystem.h>
12 #include <stdint.h> 10 #include <stdint.h>
13 11
12 #include <memory>
13 #include <string>
14
14 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
17 #include "base/threading/thread_checker.h" 18 #include "base/threading/thread_checker.h"
18 #include "base/win/scoped_handle.h" 19 #include "base/win/scoped_handle.h"
19 #include "media/audio/audio_io.h" 20 #include "media/audio/audio_io.h"
20 #include "media/base/audio_parameters.h" 21 #include "media/base/audio_parameters.h"
21 22
22 namespace media { 23 namespace media {
23 24
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 WAVEHDR* buffer_; 122 WAVEHDR* buffer_;
122 123
123 // An event that is signaled when the callback thread is ready to stop. 124 // An event that is signaled when the callback thread is ready to stop.
124 base::win::ScopedHandle stopped_event_; 125 base::win::ScopedHandle stopped_event_;
125 126
126 // Lock used to avoid conflicts when Stop() is called during a callback. 127 // Lock used to avoid conflicts when Stop() is called during a callback.
127 base::Lock lock_; 128 base::Lock lock_;
128 129
129 // Extra audio bus used for storage of deinterleaved data for the OnData 130 // Extra audio bus used for storage of deinterleaved data for the OnData
130 // callback. 131 // callback.
131 scoped_ptr<media::AudioBus> audio_bus_; 132 std::unique_ptr<media::AudioBus> audio_bus_;
132 133
133 DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream); 134 DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream);
134 }; 135 };
135 136
136 } // namespace media 137 } // namespace media
137 138
138 #endif // MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_ 139 #endif // MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_
OLDNEW
« no previous file with comments | « media/audio/win/core_audio_util_win_unittest.cc ('k') | media/audio/win/waveout_output_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698