OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ | 10 #ifndef WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ |
(...skipping 15 matching lines...) Expand all Loading... | |
26 | 26 |
27 // An object that stores initialization parameters for screen and window | 27 // An object that stores initialization parameters for screen and window |
28 // capturers. | 28 // capturers. |
29 class DesktopCaptureOptions { | 29 class DesktopCaptureOptions { |
30 public: | 30 public: |
31 // Returns instance of DesktopCaptureOptions with default parameters. On Linux | 31 // Returns instance of DesktopCaptureOptions with default parameters. On Linux |
32 // also initializes X window connection. x_display() will be set to null if | 32 // also initializes X window connection. x_display() will be set to null if |
33 // X11 connection failed (e.g. DISPLAY isn't set). | 33 // X11 connection failed (e.g. DISPLAY isn't set). |
34 static DesktopCaptureOptions CreateDefault(); | 34 static DesktopCaptureOptions CreateDefault(); |
35 | 35 |
36 DesktopCaptureOptions(); | |
37 DesktopCaptureOptions(const DesktopCaptureOptions& options); | |
Hzj_jie
2016/10/19 23:53:32
If a copy constructor has been defined, the defaul
Sergey Ulanov
2016/10/20 00:00:25
Done. Also added assignment operators as they get
| |
38 ~DesktopCaptureOptions(); | |
39 | |
36 #if defined(USE_X11) | 40 #if defined(USE_X11) |
37 SharedXDisplay* x_display() const { return x_display_; } | 41 SharedXDisplay* x_display() const { return x_display_; } |
38 void set_x_display(rtc::scoped_refptr<SharedXDisplay> x_display) { | 42 void set_x_display(rtc::scoped_refptr<SharedXDisplay> x_display) { |
39 x_display_ = x_display; | 43 x_display_ = x_display; |
40 } | 44 } |
41 #endif | 45 #endif |
42 | 46 |
43 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) | 47 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) |
44 DesktopConfigurationMonitor* configuration_monitor() const { | 48 DesktopConfigurationMonitor* configuration_monitor() const { |
45 return configuration_monitor_; | 49 return configuration_monitor_; |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
119 #else | 123 #else |
120 bool use_update_notifications_ = true; | 124 bool use_update_notifications_ = true; |
121 #endif | 125 #endif |
122 bool disable_effects_ = true; | 126 bool disable_effects_ = true; |
123 bool detect_updated_region_ = false; | 127 bool detect_updated_region_ = false; |
124 }; | 128 }; |
125 | 129 |
126 } // namespace webrtc | 130 } // namespace webrtc |
127 | 131 |
128 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ | 132 #endif // WEBRTC_MODULES_DESKTOP_CAPTURE_DESKTOP_CAPTURE_OPTIONS_H_ |
OLD | NEW |