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

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: Rebased to b647aca12a884a13c1728118586245399b55fa3d (#11493) Created 4 years, 10 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 | « webrtc/media/devices/macdevicemanager.cc ('k') | webrtc/media/devices/mobiledevicemanager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2010 Google Inc. 3 * Copyright 2010 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 12 matching lines...) Expand all
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 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 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 // support GCC compiler 28 // support GCC compiler
29 #ifndef __has_feature 29 #ifndef __has_feature
30 #define __has_feature(x) 0 30 #define __has_feature(x) 0
31 #endif 31 #endif
32 32
33 #include "talk/media/devices/devicemanager.h" 33 #include "webrtc/media/devices/devicemanager.h"
34 34
35 #import <assert.h> 35 #import <assert.h>
36 #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED 36 #ifdef __MAC_OS_X_VERSION_MAX_ALLOWED
37 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 37 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
38 #import <AVFoundation/AVFoundation.h> 38 #import <AVFoundation/AVFoundation.h>
39 #endif 39 #endif
40 #endif 40 #endif
41 #import <QTKit/QTKit.h> 41 #import <QTKit/QTKit.h>
42 42
43 #include "webrtc/base/logging.h" 43 #include "webrtc/base/logging.h"
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 return true; 183 return true;
184 #else // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070 184 #else // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070
185 return GetQTKitVideoDevices(devices); 185 return GetQTKitVideoDevices(devices);
186 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070 186 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED >=1070
187 #else // __MAC_OS_X_VERSION_MAX_ALLOWED 187 #else // __MAC_OS_X_VERSION_MAX_ALLOWED
188 return GetQTKitVideoDevices(devices); 188 return GetQTKitVideoDevices(devices);
189 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED 189 #endif // __MAC_OS_X_VERSION_MAX_ALLOWED
190 } 190 }
191 191
192 } // namespace cricket 192 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/devices/macdevicemanager.cc ('k') | webrtc/media/devices/mobiledevicemanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698