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

Side by Side Diff: media/audio/cras/cras_input.h

Issue 132773002: Fix chromeos=1 so Pulse is preferred when use_cras=0. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove alsa_util.h dependency. Created 6 years, 11 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 | Annotate | Revision Log
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_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 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/weak_ptr.h"
15 #include "media/audio/agc_audio_stream.h" 13 #include "media/audio/agc_audio_stream.h"
16 #include "media/audio/audio_io.h" 14 #include "media/audio/audio_io.h"
17 #include "media/audio/audio_parameters.h" 15 #include "media/audio/audio_parameters.h"
18 16
19 namespace media { 17 namespace media {
20 18
21 class AudioManagerCras; 19 class AudioManagerCras;
22 20
23 // Provides an input stream for audio capture based on CRAS, the ChromeOS Audio 21 // Provides an input stream for audio capture based on CRAS, the ChromeOS Audio
24 // Server. This object is not thread safe and all methods should be invoked in 22 // Server. This object is not thread safe and all methods should be invoked in
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 cras_stream_id_t stream_id_; 96 cras_stream_id_t stream_id_;
99 97
100 // Direction of the stream. 98 // Direction of the stream.
101 const CRAS_STREAM_DIRECTION stream_direction_; 99 const CRAS_STREAM_DIRECTION stream_direction_;
102 100
103 DISALLOW_COPY_AND_ASSIGN(CrasInputStream); 101 DISALLOW_COPY_AND_ASSIGN(CrasInputStream);
104 }; 102 };
105 103
106 } // namespace media 104 } // namespace media
107 105
108 #endif // MEDIA_AUDIO_CRAS_ALSA_INPUT_H_ 106 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698