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

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: 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 (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> 8 #include <string>
9 9
10 #include <windows.h> 10 #include <windows.h>
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 WAVEHDR* buffer_; 121 WAVEHDR* buffer_;
122 122
123 // An event that is signaled when the callback thread is ready to stop. 123 // An event that is signaled when the callback thread is ready to stop.
124 base::win::ScopedHandle stopped_event_; 124 base::win::ScopedHandle stopped_event_;
125 125
126 // Lock used to avoid conflicts when Stop() is called during a callback. 126 // Lock used to avoid conflicts when Stop() is called during a callback.
127 base::Lock lock_; 127 base::Lock lock_;
128 128
129 // Extra audio bus used for storage of deinterleaved data for the OnData 129 // Extra audio bus used for storage of deinterleaved data for the OnData
130 // callback. 130 // callback.
131 scoped_ptr<media::AudioBus> audio_bus_; 131 std::unique_ptr<media::AudioBus> audio_bus_;
danakj 2016/04/22 22:47:38 include memory
132 132
133 DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream); 133 DISALLOW_COPY_AND_ASSIGN(PCMWaveInAudioInputStream);
134 }; 134 };
135 135
136 } // namespace media 136 } // namespace media
137 137
138 #endif // MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_ 138 #endif // MEDIA_AUDIO_WIN_WAVEIN_INPUT_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698