diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-21 10:44:47 +0100 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2017-02-27 10:30:55 +0000 |
| commit | 95de9e6154d75688e81a3b79007dfe6c56d3b65b (patch) | |
| tree | a9effd19086e8b29651414fd657d963e8de47cba /src/plugins/gstreamer/camerabin/camerabinimageprocessing.h | |
| parent | 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 (diff) | |
Use QT_CONFIG macro to check for features
And remove many custom defines.
Change-Id: I658cc8430d1d99ed3c0aafe03a77adce76621a29
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/gstreamer/camerabin/camerabinimageprocessing.h')
| -rw-r--r-- | src/plugins/gstreamer/camerabin/camerabinimageprocessing.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h index 82c6e1678..b09c8d52b 100644 --- a/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h +++ b/src/plugins/gstreamer/camerabin/camerabinimageprocessing.h @@ -40,13 +40,14 @@ #ifndef CAMERABINIMAGEPROCESSINGCONTROL_H #define CAMERABINIMAGEPROCESSINGCONTROL_H +#include <QtMultimedia/private/qtmultimediaglobal_p.h> #include <qcamera.h> #include <qcameraimageprocessingcontrol.h> #include <gst/gst.h> #include <glib.h> -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) # include <gst/interfaces/photography.h> # if !GST_CHECK_VERSION(1,0,0) typedef GstWhiteBalanceMode GstPhotographyWhiteBalanceMode; @@ -56,7 +57,7 @@ typedef GstColourToneMode GstPhotographyColorToneMode; QT_BEGIN_NAMESPACE -#ifdef USE_V4L +#if QT_CONFIG(linux_v4l) class CameraBinV4LImageProcessing; #endif @@ -79,7 +80,7 @@ public: QVariant parameter(ProcessingParameter parameter) const; void setParameter(ProcessingParameter parameter, const QVariant &value); -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) void lockWhiteBalance(); void unlockWhiteBalance(); #endif @@ -91,13 +92,13 @@ private: private: CameraBinSession *m_session; QMap<QCameraImageProcessingControl::ProcessingParameter, int> m_values; -#ifdef HAVE_GST_PHOTOGRAPHY +#if QT_CONFIG(gstreamer_photography) QMap<GstPhotographyWhiteBalanceMode, QCameraImageProcessing::WhiteBalanceMode> m_mappedWbValues; QMap<QCameraImageProcessing::ColorFilter, GstPhotographyColorToneMode> m_filterMap; #endif QCameraImageProcessing::WhiteBalanceMode m_whiteBalanceMode; -#ifdef USE_V4L +#if QT_CONFIG(linux_v4l) CameraBinV4LImageProcessing *m_v4lImageControl; #endif }; |