| Index: content/common/media/media_stream_options.h
|
| diff --git a/content/common/media/media_stream_options.h b/content/common/media/media_stream_options.h
|
| index c51d700ee8b5a68088d444f6b429a23ec6c9e80d..ddd47dd0ddbb5f1a51b7b111e74a30daa4b552e5 100644
|
| --- a/content/common/media/media_stream_options.h
|
| +++ b/content/common/media/media_stream_options.h
|
| @@ -13,23 +13,24 @@
|
|
|
| namespace media_stream {
|
|
|
| +typedef content::MediaStreamDeviceType MediaStreamType;
|
| +
|
| // StreamOptions is a Chromium representation of WebKit's
|
| // WebUserMediaRequest Options. It describes the components
|
| // in a request for a new media stream.
|
| struct CONTENT_EXPORT StreamOptions {
|
| - StreamOptions() : audio(false), video(false) {}
|
| - StreamOptions(bool audio, bool video)
|
| - : audio(audio), video(video) {}
|
| + StreamOptions();
|
| + // TODO(miu): Remove the 2-bools ctor in later clean-up CL.
|
| + StreamOptions(bool user_audio, bool user_video);
|
| + StreamOptions(MediaStreamType audio_type, MediaStreamType video_type);
|
|
|
| - // True if the stream shall contain an audio input stream.
|
| - bool audio;
|
| + // If not NO_SERVICE, the stream shall contain an audio input stream.
|
| + MediaStreamType audio_type;
|
|
|
| - // True if the stream shall contain a video input stream.
|
| - bool video;
|
| + // If not NO_SERVICE, the stream shall contain a video input stream.
|
| + MediaStreamType video_type;
|
| };
|
|
|
| -typedef content::MediaStreamDeviceType MediaStreamType;
|
| -
|
| // StreamDeviceInfo describes information about a device.
|
| struct CONTENT_EXPORT StreamDeviceInfo {
|
| static const int kNoId;
|
|
|