diff options
| author | Yoann Lopes <yoann.lopes@theqtcompany.com> | 2016-01-29 15:18:33 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-07-06 14:14:23 +0000 |
| commit | 631b89ddde44dfc8b72b904d8c41368b2c02d037 (patch) | |
| tree | 572f74f306ef76cffac8a6ea47b90dbb836d95a8 /src/plugins/directshow/camera | |
| parent | c2f15b6071778c776b61d8807251a69adb96882e (diff) | |
DirectShow: refactor custom renderer filter
Refactor out some of the filter and pin logic into the
DirectShowBaseFilter and DirectShowPin abstract classes.
This will avoid code duplication when implementing the probe
filter. The existing source filter (for qrc files) can also be
refactored to use these abstract classes.
Change-Id: Iaf141472dea82579ad085b3318624f9a57aa46d8
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/directshow/camera')
| -rw-r--r-- | src/plugins/directshow/camera/camera.pri | 2 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/directshowcameraglobal.h (renamed from src/plugins/directshow/camera/directshowglobal.h) | 4 | ||||
| -rw-r--r-- | src/plugins/directshow/camera/dscamerasession.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri index c6b16da59..6c67a8fe2 100644 --- a/src/plugins/directshow/camera/camera.pri +++ b/src/plugins/directshow/camera/camera.pri @@ -13,7 +13,7 @@ HEADERS += \ $$PWD/dsvideodevicecontrol.h \ $$PWD/dsimagecapturecontrol.h \ $$PWD/dscamerasession.h \ - $$PWD/directshowglobal.h \ + $$PWD/directshowcameraglobal.h \ $$PWD/dscameraviewfindersettingscontrol.h \ $$PWD/dscameraimageprocessingcontrol.h diff --git a/src/plugins/directshow/camera/directshowglobal.h b/src/plugins/directshow/camera/directshowcameraglobal.h index 46d161336..75112a090 100644 --- a/src/plugins/directshow/camera/directshowglobal.h +++ b/src/plugins/directshow/camera/directshowcameraglobal.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef DIRECTSHOWGLOBAL_H -#define DIRECTSHOWGLOBAL_H +#ifndef DIRECTSHOWCAMERAGLOBAL_H +#define DIRECTSHOWCAMERAGLOBAL_H #include <QtCore/qglobal.h> diff --git a/src/plugins/directshow/camera/dscamerasession.cpp b/src/plugins/directshow/camera/dscamerasession.cpp index 9e1be9606..4208f934f 100644 --- a/src/plugins/directshow/camera/dscamerasession.cpp +++ b/src/plugins/directshow/camera/dscamerasession.cpp @@ -47,7 +47,7 @@ #include "dscamerasession.h" #include "dsvideorenderer.h" -#include "directshowglobal.h" +#include "directshowcameraglobal.h" QT_BEGIN_NAMESPACE |