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

Side by Side Diff: media/audio/alsa/audio_manager_alsa.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 #ifndef MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_ 5 #ifndef MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
6 #define MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_ 6 #define MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
7 7
8 #include <string> 8 #include <string>
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // Returns true if a device is present for the given stream type. 80 // Returns true if a device is present for the given stream type.
81 bool HasAnyAlsaAudioDevice(StreamType stream); 81 bool HasAnyAlsaAudioDevice(StreamType stream);
82 82
83 // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. 83 // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
84 AudioOutputStream* MakeOutputStream(const AudioParameters& params); 84 AudioOutputStream* MakeOutputStream(const AudioParameters& params);
85 85
86 // Called by MakeLinearInputStream and MakeLowLatencyInputStream. 86 // Called by MakeLinearInputStream and MakeLowLatencyInputStream.
87 AudioInputStream* MakeInputStream(const AudioParameters& params, 87 AudioInputStream* MakeInputStream(const AudioParameters& params,
88 const std::string& device_id); 88 const std::string& device_id);
89 89
90 scoped_ptr<AlsaWrapper> wrapper_; 90 std::unique_ptr<AlsaWrapper> wrapper_;
danakj 2016/04/22 22:47:35 include memory
dcheng 2016/04/22 23:13:19 Done.
91 91
92 DISALLOW_COPY_AND_ASSIGN(AudioManagerAlsa); 92 DISALLOW_COPY_AND_ASSIGN(AudioManagerAlsa);
93 }; 93 };
94 94
95 } // namespace media 95 } // namespace media
96 96
97 #endif // MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_ 97 #endif // MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698