From d73c4932978c622161ede3cccf3183b066aab7c2 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Fri, 31 Aug 2012 19:06:49 +0300 Subject: [PATCH] Added night framerate to image and video settings --- lib/qtcamconfig.cpp | 20 ++++++++++++++------ lib/qtcamimagesettings.cpp | 15 ++++++++++++++- lib/qtcamimagesettings.h | 3 ++- lib/qtcamvideosettings.cpp | 15 ++++++++++++++- lib/qtcamvideosettings.h | 3 ++- 5 files changed, 46 insertions(+), 10 deletions(-) diff --git a/lib/qtcamconfig.cpp b/lib/qtcamconfig.cpp index 1cb9624..bc47b04 100644 --- a/lib/qtcamconfig.cpp +++ b/lib/qtcamconfig.cpp @@ -16,8 +16,8 @@ public: return QSize(parts[0].toInt(), parts[1].toInt()); } - QPair readFrameRate() { - QList parts = conf->value("fps").toString().trimmed().split("/"); + QPair readFrameRate(const QString& key) { + QList parts = conf->value(key).toString().trimmed().split("/"); return qMakePair(parts[0].toInt(), parts[1].toInt()); } @@ -98,13 +98,17 @@ QList QtCamConfig::imageSettings() { QStringList presets = d_ptr->conf->value("image/presets").toStringList(); foreach (const QString& preset, presets) { d_ptr->conf->beginGroup(preset); - QPair fps = d_ptr->readFrameRate(); + + QPair fps = d_ptr->readFrameRate("fps"); + QPair night = d_ptr->readFrameRate("night"); + d_ptr->imageSettings << QtCamImageSettings(preset, d_ptr->conf->value("name").toString(), d_ptr->readResolution("capture"), d_ptr->readResolution("preview"), d_ptr->readResolution("viewfinder"), - fps.first, fps.second); + fps.first, fps.second, night.first, night.second); + d_ptr->conf->endGroup(); } } @@ -132,12 +136,16 @@ QList QtCamConfig::videoSettings() { QStringList presets = d_ptr->conf->value("video/presets").toStringList(); foreach (const QString& preset, presets) { d_ptr->conf->beginGroup(preset); - QPair fps = d_ptr->readFrameRate(); + + QPair fps = d_ptr->readFrameRate("fps"); + QPair night = d_ptr->readFrameRate("night"); + d_ptr->videoSettings << QtCamVideoSettings(preset, d_ptr->conf->value("name").toString(), d_ptr->readResolution("capture"), d_ptr->readResolution("preview"), - fps.first, fps.second); + fps.first, fps.second, night.first, night.second); + d_ptr->conf->endGroup(); } } diff --git a/lib/qtcamimagesettings.cpp b/lib/qtcamimagesettings.cpp index 6bcde00..ed0c500 100644 --- a/lib/qtcamimagesettings.cpp +++ b/lib/qtcamimagesettings.cpp @@ -9,12 +9,15 @@ public: QSize viewfinder; int numerator; int denominator; + int nightNumerator; + int nightDenominator; }; QtCamImageSettings::QtCamImageSettings(const QString& id, const QString& name, const QSize& capture, const QSize& preview, const QSize& viewfinder, - int numerator, int denominator) : + int numerator, int denominator, + int nightNumerator, int nightDenominator) : d_ptr(new QtCamImageSettingsPrivate) { d_ptr->id = id; @@ -24,6 +27,8 @@ QtCamImageSettings::QtCamImageSettings(const QString& id, const QString& name, d_ptr->viewfinder = viewfinder; d_ptr->numerator = numerator; d_ptr->denominator = denominator; + d_ptr->nightNumerator = nightNumerator; + d_ptr->nightDenominator = nightDenominator; } QtCamImageSettings::QtCamImageSettings(const QtCamImageSettings& other) : @@ -36,6 +41,8 @@ QtCamImageSettings::QtCamImageSettings(const QtCamImageSettings& other) : d_ptr->viewfinder = other.d_ptr->viewfinder; d_ptr->numerator = other.d_ptr->numerator; d_ptr->denominator = other.d_ptr->denominator; + d_ptr->nightNumerator = other.d_ptr->nightNumerator; + d_ptr->nightDenominator = other.d_ptr->nightDenominator; } QtCamImageSettings::~QtCamImageSettings() { @@ -51,6 +58,8 @@ QtCamImageSettings& QtCamImageSettings::operator=(const QtCamImageSettings& d_ptr->viewfinder = other.d_ptr->viewfinder; d_ptr->numerator = other.d_ptr->numerator; d_ptr->denominator = other.d_ptr->denominator; + d_ptr->nightNumerator = other.d_ptr->nightNumerator; + d_ptr->nightDenominator = other.d_ptr->nightDenominator; return *this; } @@ -78,3 +87,7 @@ QSize QtCamImageSettings::previewResolution() const { QPair QtCamImageSettings::frameRate() const { return qMakePair(d_ptr->numerator, d_ptr->denominator); } + +QPair QtCamImageSettings::nightFrameRate() const { + return qMakePair(d_ptr->nightNumerator, d_ptr->nightDenominator); +} diff --git a/lib/qtcamimagesettings.h b/lib/qtcamimagesettings.h index 940347a..7d79871 100644 --- a/lib/qtcamimagesettings.h +++ b/lib/qtcamimagesettings.h @@ -13,7 +13,7 @@ class QtCamImageSettings { public: QtCamImageSettings(const QString& id, const QString& name, const QSize& capture, const QSize& preview, const QSize& viewfinder, - int numerator, int denominator); + int numerator, int denominator, int nightNumerator, int nightDenominator); QtCamImageSettings(const QtCamImageSettings& other); @@ -27,6 +27,7 @@ public: QSize viewfinderResolution() const; QSize previewResolution() const; QPair frameRate() const; + QPair nightFrameRate() const; private: QtCamImageSettingsPrivate *d_ptr; diff --git a/lib/qtcamvideosettings.cpp b/lib/qtcamvideosettings.cpp index 7e3f478..ff28ca7 100644 --- a/lib/qtcamvideosettings.cpp +++ b/lib/qtcamvideosettings.cpp @@ -8,11 +8,14 @@ public: QSize preview; int numerator; int denominator; + int nightNumerator; + int nightDenominator; }; QtCamVideoSettings::QtCamVideoSettings(const QString& id, const QString& name, const QSize& capture, const QSize& preview, - int numerator, int denominator) : + int numerator, int denominator, + int nightNumerator, int nightDenominator) : d_ptr(new QtCamVideoSettingsPrivate) { d_ptr->id = id; @@ -21,6 +24,8 @@ QtCamVideoSettings::QtCamVideoSettings(const QString& id, const QString& name, d_ptr->preview = preview; d_ptr->numerator = numerator; d_ptr->denominator = denominator; + d_ptr->nightNumerator = nightNumerator; + d_ptr->nightDenominator = nightDenominator; } QtCamVideoSettings::QtCamVideoSettings(const QtCamVideoSettings& other) : @@ -32,6 +37,8 @@ QtCamVideoSettings::QtCamVideoSettings(const QtCamVideoSettings& other) : d_ptr->preview = other.d_ptr->preview; d_ptr->numerator = other.d_ptr->numerator; d_ptr->denominator = other.d_ptr->denominator; + d_ptr->nightNumerator = other.d_ptr->nightNumerator; + d_ptr->nightDenominator = other.d_ptr->nightDenominator; } QtCamVideoSettings::~QtCamVideoSettings() { @@ -46,6 +53,8 @@ QtCamVideoSettings& QtCamVideoSettings::operator=(const QtCamVideoSettings& d_ptr->preview = other.d_ptr->preview; d_ptr->numerator = other.d_ptr->numerator; d_ptr->denominator = other.d_ptr->denominator; + d_ptr->nightNumerator = other.d_ptr->nightNumerator; + d_ptr->nightDenominator = other.d_ptr->nightDenominator; return *this; } @@ -69,3 +78,7 @@ QSize QtCamVideoSettings::previewResolution() const { QPair QtCamVideoSettings::frameRate() const { return qMakePair(d_ptr->numerator, d_ptr->denominator); } + +QPair QtCamVideoSettings::nightFrameRate() const { + return qMakePair(d_ptr->nightNumerator, d_ptr->nightDenominator); +} diff --git a/lib/qtcamvideosettings.h b/lib/qtcamvideosettings.h index a25ab83..c829b54 100644 --- a/lib/qtcamvideosettings.h +++ b/lib/qtcamvideosettings.h @@ -13,7 +13,7 @@ class QtCamVideoSettings { public: QtCamVideoSettings(const QString& id, const QString& name, const QSize& capture, const QSize& preview, - int numerator, int denominator); + int numerator, int denominator, int nightNumerator, int nightDenominator); QtCamVideoSettings(const QtCamVideoSettings& other); @@ -26,6 +26,7 @@ public: QSize captureResolution() const; QSize previewResolution() const; QPair frameRate() const; + QPair nightFrameRate() const; private: QtCamVideoSettingsPrivate *d_ptr; -- 2.25.1