| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
| 3 // LICENSE file. | 3 // LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_PLAYER_X11_VIDEO_RENDERER_H_ | 5 #ifndef MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_ |
| 6 #define MEDIA_PLAYER_X11_VIDEO_RENDERER_H_ | 6 #define MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_ |
| 7 | 7 |
| 8 #include <X11/Xlib.h> | 8 #include <X11/Xlib.h> |
| 9 | 9 |
| 10 #include "base/lock.h" | 10 #include "base/lock.h" |
| 11 #include "base/scoped_ptr.h" | 11 #include "base/scoped_ptr.h" |
| 12 #include "media/base/factory.h" | 12 #include "media/base/factory.h" |
| 13 #include "media/filters/video_renderer_base.h" | 13 #include "media/filters/video_renderer_base.h" |
| 14 | 14 |
| 15 class X11VideoRenderer : public media::VideoRendererBase { | 15 class X11VideoRenderer : public media::VideoRendererBase { |
| 16 public: | 16 public: |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 // in the server. | 60 // in the server. |
| 61 unsigned long picture_; | 61 unsigned long picture_; |
| 62 | 62 |
| 63 bool use_render_; | 63 bool use_render_; |
| 64 | 64 |
| 65 static X11VideoRenderer* instance_; | 65 static X11VideoRenderer* instance_; |
| 66 | 66 |
| 67 DISALLOW_COPY_AND_ASSIGN(X11VideoRenderer); | 67 DISALLOW_COPY_AND_ASSIGN(X11VideoRenderer); |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 #endif // MEDIA_PLAYER_X11_VIDEO_RENDERER_H_ | 70 #endif // MEDIA_TOOLS_PLAYER_X11_X11_VIDEO_RENDERER_H_ |
| OLD | NEW |