Chromium Code Reviews

Side by Side Diff: webrtc/media/devices/linuxdeviceinfo.cc

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Disable sign-compare warning on Win Clang Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved.
3 * Copyright 2012 Google Inc.
4 * 3 *
5 * Redistribution and use in source and binary forms, with or without 4 * Use of this source code is governed by a BSD-style license
6 * modification, are permitted provided that the following conditions are met: 5 * that can be found in the LICENSE file in the root of the source
7 * 6 * tree. An additional intellectual property rights grant can be found
8 * 1. Redistributions of source code must retain the above copyright notice, 7 * in the file PATENTS. All contributing project authors may
9 * this list of conditions and the following disclaimer. 8 * be found in the AUTHORS file in the root of the source tree.
10 * 2. Redistributions in binary form must reproduce the above copyright notice,
11 * this list of conditions and the following disclaimer in the documentation
12 * and/or other materials provided with the distribution.
13 * 3. The name of the author may not be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 9 */
27 10
28 #include "talk/media/devices/deviceinfo.h" 11 #include "webrtc/media/devices/deviceinfo.h"
29 12
30 #include "talk/media/devices/libudevsymboltable.h"
31 #include "webrtc/base/common.h" // for ASSERT 13 #include "webrtc/base/common.h" // for ASSERT
14 #include "webrtc/media/devices/libudevsymboltable.h"
32 15
33 namespace cricket { 16 namespace cricket {
34 17
35 class ScopedLibUdev { 18 class ScopedLibUdev {
36 public: 19 public:
37 static ScopedLibUdev* Create() { 20 static ScopedLibUdev* Create() {
38 ScopedLibUdev* ret_val = new ScopedLibUdev(); 21 ScopedLibUdev* ret_val = new ScopedLibUdev();
39 if (!ret_val->Init()) { 22 if (!ret_val->Init()) {
40 delete ret_val; 23 delete ret_val;
41 return NULL; 24 return NULL;
(...skipping 123 matching lines...)
165 usb_id->append(":"); 148 usb_id->append(":");
166 usb_id->append(id_product); 149 usb_id->append(id_product);
167 return true; 150 return true;
168 } 151 }
169 152
170 bool GetUsbVersion(const Device& device, std::string* usb_version) { 153 bool GetUsbVersion(const Device& device, std::string* usb_version) {
171 return GetUsbProperty(device, "version", usb_version); 154 return GetUsbProperty(device, "version", usb_version);
172 } 155 }
173 156
174 } // namespace cricket 157 } // namespace cricket
OLDNEW

Powered by Google App Engine