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

Side by Side Diff: webrtc/media/devices/macdevicemanagermm.mm

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. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * Copyright 2010 The WebRTC Project Authors. All rights reserved.
3 * Copyright 2010 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 // support GCC compiler 11 // support GCC compiler
29 #ifndef __has_feature 12 #ifndef __has_feature
30 #define __has_feature(x) 0 13 #define __has_feature(x) 0
31 #endif 14 #endif
32 15
33 #include "talk/media/devices/devicemanager.h" 16 #include "webrtc/media/devices/devicemanager.h"
34 17
35 #import <assert.h> 18 #import <assert.h>
36 #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED 19 #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
37 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 20 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
38 #import <AVFoundation/AVFoundation.h> 21 #import <AVFoundation/AVFoundation.h>
39 #endif 22 #endif
40 #endif 23 #endif
41 #import <QTKit/QTKit.h> 24 #import <QTKit/QTKit.h>
42 25
43 #include "webrtc/base/logging.h" 26 #include "webrtc/base/logging.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 return true; 166 return true;
184 #else // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070 167 #else // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070
185 return GetQTKitVideoDevices(devices); 168 return GetQTKitVideoDevices(devices);
186 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070 169 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070
187 #else // __MAC_OS_X_VERSION_MAX_ALLOWED 170 #else // __MAC_OS_X_VERSION_MAX_ALLOWED
188 return GetQTKitVideoDevices(devices); 171 return GetQTKitVideoDevices(devices);
189 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED 172 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED
190 } 173 }
191 174
192 } // namespace cricket 175 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698