| OLD | NEW |
| 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 #include "content/common/media/media_stream_options.h" | 5 #include "content/common/media/media_stream_options.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 namespace content { | 9 namespace content { |
| 10 | 10 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 StreamControls::~StreamControls() {} | 38 StreamControls::~StreamControls() {} |
| 39 | 39 |
| 40 // static | 40 // static |
| 41 const int StreamDeviceInfo::kNoId = -1; | 41 const int StreamDeviceInfo::kNoId = -1; |
| 42 | 42 |
| 43 StreamDeviceInfo::StreamDeviceInfo() | 43 StreamDeviceInfo::StreamDeviceInfo() |
| 44 : session_id(kNoId) {} | 44 : session_id(kNoId) {} |
| 45 | 45 |
| 46 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, | 46 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, |
| 47 const std::string& name_param, | 47 const std::string& name_param, |
| 48 const std::string& device_param) |
| 49 : device(service_param, device_param, name_param), session_id(kNoId) {} |
| 50 |
| 51 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, |
| 52 const std::string& name_param, |
| 48 const std::string& device_param, | 53 const std::string& device_param, |
| 49 const std::string& group_param) | |
| 50 : device(service_param, device_param, name_param, group_param), | |
| 51 session_id(kNoId) {} | |
| 52 | |
| 53 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, | |
| 54 const std::string& name_param, | |
| 55 const std::string& device_param) | |
| 56 : StreamDeviceInfo(service_param, name_param, device_param, std::string()) { | |
| 57 } | |
| 58 | |
| 59 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, | |
| 60 const std::string& name_param, | |
| 61 const std::string& device_param, | |
| 62 const std::string& group_param, | |
| 63 int sample_rate, | 54 int sample_rate, |
| 64 int channel_layout, | 55 int channel_layout, |
| 65 int frames_per_buffer) | 56 int frames_per_buffer) |
| 66 : device(service_param, | 57 : device(service_param, |
| 67 device_param, | 58 device_param, |
| 68 name_param, | 59 name_param, |
| 69 group_param, | |
| 70 sample_rate, | 60 sample_rate, |
| 71 channel_layout, | 61 channel_layout, |
| 72 frames_per_buffer), | 62 frames_per_buffer), |
| 73 session_id(kNoId) {} | 63 session_id(kNoId) {} |
| 74 | 64 |
| 75 // static | 65 // static |
| 76 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, | 66 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, |
| 77 const StreamDeviceInfo& second) { | 67 const StreamDeviceInfo& second) { |
| 78 return first.device.IsEqual(second.device) && | 68 return first.device.IsEqual(second.device) && |
| 79 first.session_id == second.session_id; | 69 first.session_id == second.session_id; |
| 80 } | 70 } |
| 81 | 71 |
| 82 } // namespace content | 72 } // namespace content |
| OLD | NEW |