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

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: . 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/alsa/alsa_output.cc ('k') | media/audio/alsa/audio_manager_alsa.cc » ('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 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 <memory>
8 #include <string> 9 #include <string>
10
9 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
12 #include "base/threading/thread.h" 14 #include "base/threading/thread.h"
13 #include "media/audio/audio_manager_base.h" 15 #include "media/audio/audio_manager_base.h"
14 16
15 namespace media { 17 namespace media {
16 18
17 class AlsaWrapper; 19 class AlsaWrapper;
18 20
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 // Returns true if a device is present for the given stream type. 82 // Returns true if a device is present for the given stream type.
81 bool HasAnyAlsaAudioDevice(StreamType stream); 83 bool HasAnyAlsaAudioDevice(StreamType stream);
82 84
83 // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream. 85 // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
84 AudioOutputStream* MakeOutputStream(const AudioParameters& params); 86 AudioOutputStream* MakeOutputStream(const AudioParameters& params);
85 87
86 // Called by MakeLinearInputStream and MakeLowLatencyInputStream. 88 // Called by MakeLinearInputStream and MakeLowLatencyInputStream.
87 AudioInputStream* MakeInputStream(const AudioParameters& params, 89 AudioInputStream* MakeInputStream(const AudioParameters& params,
88 const std::string& device_id); 90 const std::string& device_id);
89 91
90 scoped_ptr<AlsaWrapper> wrapper_; 92 std::unique_ptr<AlsaWrapper> wrapper_;
91 93
92 DISALLOW_COPY_AND_ASSIGN(AudioManagerAlsa); 94 DISALLOW_COPY_AND_ASSIGN(AudioManagerAlsa);
93 }; 95 };
94 96
95 } // namespace media 97 } // namespace media
96 98
97 #endif // MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_ 99 #endif // MEDIA_AUDIO_ALSA_AUDIO_MANAGER_ALSA_H_
OLDNEW
« no previous file with comments | « media/audio/alsa/alsa_output.cc ('k') | media/audio/alsa/audio_manager_alsa.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698