| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 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 | 10 |
| 11 #include "webrtc/modules/video_render/linux/video_x11_channel.h" | 11 #include "webrtc/modules/video_render/linux/video_x11_channel.h" |
| 12 | 12 |
| 13 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" | 13 #include "webrtc/system_wrappers/include/critical_section_wrapper.h" |
| 14 #include "webrtc/system_wrappers/interface/trace.h" | 14 #include "webrtc/system_wrappers/include/trace.h" |
| 15 | 15 |
| 16 namespace webrtc { | 16 namespace webrtc { |
| 17 | 17 |
| 18 #define DISP_MAX 128 | 18 #define DISP_MAX 128 |
| 19 | 19 |
| 20 static Display *dispArray[DISP_MAX]; | 20 static Display *dispArray[DISP_MAX]; |
| 21 static int dispCount = 0; | 21 static int dispCount = 0; |
| 22 | 22 |
| 23 | 23 |
| 24 VideoX11Channel::VideoX11Channel(int32_t id) : | 24 VideoX11Channel::VideoX11Channel(int32_t id) : |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 left = _left; | 306 left = _left; |
| 307 top = _top; | 307 top = _top; |
| 308 right = _right; | 308 right = _right; |
| 309 bottom = _bottom; | 309 bottom = _bottom; |
| 310 | 310 |
| 311 return 0; | 311 return 0; |
| 312 } | 312 } |
| 313 | 313 |
| 314 | 314 |
| 315 } // namespace webrtc | 315 } // namespace webrtc |
| OLD | NEW |