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

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

Issue 1183383002: Fix Clang compile error. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 | « no previous file | no next file » | 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_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>
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // True if the stream has been started. 94 // True if the stream has been started.
95 bool started_; 95 bool started_;
96 96
97 // ID of the playing stream. 97 // ID of the playing stream.
98 cras_stream_id_t stream_id_; 98 cras_stream_id_t stream_id_;
99 99
100 // Direction of the stream. 100 // Direction of the stream.
101 const CRAS_STREAM_DIRECTION stream_direction_; 101 const CRAS_STREAM_DIRECTION stream_direction_;
102 102
103 // Index of the CRAS device to stream input from. 103 // Index of the CRAS device to stream input from.
104 uint32 pin_device_; 104 int pin_device_;
105 105
106 // True if the stream is a system-wide loopback stream. 106 // True if the stream is a system-wide loopback stream.
107 bool is_loopback_; 107 bool is_loopback_;
108 108
109 scoped_ptr<AudioBus> audio_bus_; 109 scoped_ptr<AudioBus> audio_bus_;
110 110
111 DISALLOW_COPY_AND_ASSIGN(CrasInputStream); 111 DISALLOW_COPY_AND_ASSIGN(CrasInputStream);
112 }; 112 };
113 113
114 } // namespace media 114 } // namespace media
115 115
116 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_ 116 #endif // MEDIA_AUDIO_CRAS_CRAS_INPUT_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698