| Index: webrtc/modules/desktop_capture/desktop_capture_options.h
|
| diff --git a/webrtc/modules/desktop_capture/desktop_capture_options.h b/webrtc/modules/desktop_capture/desktop_capture_options.h
|
| index 68bb5884459ea13fe569a8e0d10483091f1f0450..2aa3e5197c0b3672d08a9e9dbaf574e116d35906 100644
|
| --- a/webrtc/modules/desktop_capture/desktop_capture_options.h
|
| +++ b/webrtc/modules/desktop_capture/desktop_capture_options.h
|
| @@ -28,10 +28,6 @@ namespace webrtc {
|
| // capturers.
|
| class DesktopCaptureOptions {
|
| public:
|
| - // Creates an empty Options instance (e.g. without X display).
|
| - DesktopCaptureOptions();
|
| - ~DesktopCaptureOptions();
|
| -
|
| // Returns instance of DesktopCaptureOptions with default parameters. On Linux
|
| // also initializes X window connection. x_display() will be set to null if
|
| // X11 connection failed (e.g. DISPLAY isn't set).
|
| @@ -83,6 +79,14 @@ class DesktopCaptureOptions {
|
| void set_allow_use_magnification_api(bool allow) {
|
| allow_use_magnification_api_ = allow;
|
| }
|
| + // Allowing directx based capturer or not, this capturer works on windows 7
|
| + // with platform update / windows 8 or upper.
|
| + bool allow_directx_capturer() const {
|
| + return allow_directx_capturer_;
|
| + }
|
| + void set_allow_directx_capturer(bool enabled) {
|
| + allow_directx_capturer_ = enabled;
|
| + }
|
| #endif
|
|
|
| private:
|
| @@ -97,10 +101,15 @@ class DesktopCaptureOptions {
|
| #endif
|
|
|
| #if defined(WEBRTC_WIN)
|
| - bool allow_use_magnification_api_;
|
| + bool allow_use_magnification_api_ = false;
|
| + bool allow_directx_capturer_ = false;
|
| +#endif
|
| +#if defined(USE_X11)
|
| + bool use_update_notifications_ = false;
|
| +#else
|
| + bool use_update_notifications_ = true;
|
| #endif
|
| - bool use_update_notifications_;
|
| - bool disable_effects_;
|
| + bool disable_effects_ = true;
|
| };
|
|
|
| } // namespace webrtc
|
|
|