projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move qt_cam_copy_register to QtCamera
[harmattan/cameraplus]
/
lib
/
qtcamconfig.h
diff --git
a/lib/qtcamconfig.h
b/lib/qtcamconfig.h
index
7d06a82
..
bd1469c
100644
(file)
--- a/
lib/qtcamconfig.h
+++ b/
lib/qtcamconfig.h
@@
-3,7
+3,7
@@
/*!
* This file is part of CameraPlus.
*
/*!
* This file is part of CameraPlus.
*
- * Copyright (C) 2012 Mohammed Sameer <msameer@foolab.org>
+ * Copyright (C) 2012
-2013
Mohammed Sameer <msameer@foolab.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@
-24,17
+24,21
@@
#define QT_CAM_CONFIG_H
#include <QObject>
#define QT_CAM_CONFIG_H
#include <QObject>
-#include "qtcamimagesettings.h"
-#include "qtcamvideosettings.h"
+#include <QStringList>
+
+class QtCamImageSettings;
+class QtCamVideoSettings;
+class QtCamQuirks;
#define SCANNER_TYPE_V4L2 "v4l2"
#define SCANNER_TYPE_ENUM "enum"
#define SCANNER_TYPE_V4L2 "v4l2"
#define SCANNER_TYPE_ENUM "enum"
-// TODO: kill those
-//#define RENDERER_TYPE_GL_SINK "glsink"
-//#define RENDERER_TYPE_X_OVERLAY "xoverlay"
#define RENDERER_TYPE_MEEGO "meego"
#define RENDERER_TYPE_MEEGO "meego"
-#define RENDERER_TYPE_GENERIC "generic"
+
+#ifndef DATA_DIR
+#define DATA_DIR "/usr/share/qtcamera/config/"
+#endif /* DATA_DIR */
+
class QtCamConfigPrivate;
class QtCamConfig : public QObject {
class QtCamConfigPrivate;
class QtCamConfig : public QObject {
@@
-50,14
+54,18
@@
public:
QString deviceScannerProperty() const;
QString videoSource() const;
QString deviceScannerProperty() const;
QString videoSource() const;
+
QString viewfinderSink() const;
QString viewfinderRenderer() const;
QString viewfinderSink() const;
QString viewfinderRenderer() const;
+ bool viewfinderUseFence() const;
+
QString audioSource() const;
QString wrapperVideoSource() const;
QString wrapperVideoSourceProperty() const;
QtCamImageSettings *imageSettings(const QVariant& id);
QtCamVideoSettings *videoSettings(const QVariant& id);
QString audioSource() const;
QString wrapperVideoSource() const;
QString wrapperVideoSourceProperty() const;
QtCamImageSettings *imageSettings(const QVariant& id);
QtCamVideoSettings *videoSettings(const QVariant& id);
+ QtCamQuirks *quirks(const QVariant& id);
QString imageEncodingProfileName() const;
QString imageEncodingProfilePath() const;
QString imageEncodingProfileName() const;
QString imageEncodingProfilePath() const;
@@
-70,6
+78,15
@@
public:
QString audioCaptureCaps() const;
QString audioCaptureCaps() const;
+ QStringList viewfinderFilters() const;
+
+ QString roiElement() const;
+ QString roiMessageName() const;
+ QString roiEnableProperty() const;
+ QString roiMessage() const;
+
+ bool isPreviewSupported() const;
+
private:
QtCamConfigPrivate *d_ptr;
};
private:
QtCamConfigPrivate *d_ptr;
};