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

Side by Side Diff: talk/media/devices/fakedevicemanager.h

Issue 1588453005: Eliminate defines in talk/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Excluding iOS from converted OSX defines 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
« no previous file with comments | « talk/media/devices/devicemanager_unittest.cc ('k') | talk/media/devices/v4llookup.h » ('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 2008 Google Inc. 3 * Copyright 2008 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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 149 }
150 150
151 virtual bool GetDefaultVideoCaptureDevice(Device* device) { 151 virtual bool GetDefaultVideoCaptureDevice(Device* device) {
152 if (vidcap_devices_.empty()) { 152 if (vidcap_devices_.empty()) {
153 return false; 153 return false;
154 } 154 }
155 *device = vidcap_devices_[0]; 155 *device = vidcap_devices_[0];
156 return true; 156 return true;
157 } 157 }
158 158
159 #ifdef OSX 159 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
160 bool QtKitToSgDevice(const std::string& qtkit_name, Device* out) { 160 bool QtKitToSgDevice(const std::string& qtkit_name, Device* out) {
161 out->name = qtkit_name; 161 out->name = qtkit_name;
162 out->id = "sg:" + qtkit_name; 162 out->id = "sg:" + qtkit_name;
163 return true; 163 return true;
164 } 164 }
165 #endif 165 #endif
166 166
167 void SetAudioInputDevices(const std::vector<std::string>& devices) { 167 void SetAudioInputDevices(const std::vector<std::string>& devices) {
168 input_devices_.clear(); 168 input_devices_.clear();
169 for (size_t i = 0; i < devices.size(); ++i) { 169 for (size_t i = 0; i < devices.size(); ++i) {
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 std::vector<Device> output_devices_; 230 std::vector<Device> output_devices_;
231 std::vector<Device> vidcap_devices_; 231 std::vector<Device> vidcap_devices_;
232 std::map<std::string, VideoFormat> max_formats_; 232 std::map<std::string, VideoFormat> max_formats_;
233 rtc::scoped_ptr< 233 rtc::scoped_ptr<
234 ScreenCapturerFactory> screen_capturer_factory_; 234 ScreenCapturerFactory> screen_capturer_factory_;
235 }; 235 };
236 236
237 } // namespace cricket 237 } // namespace cricket
238 238
239 #endif // TALK_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_ 239 #endif // TALK_MEDIA_DEVICES_FAKEDEVICEMANAGER_H_
OLDNEW
« no previous file with comments | « talk/media/devices/devicemanager_unittest.cc ('k') | talk/media/devices/v4llookup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698