return QSize(parts[0].toInt(), parts[1].toInt());
}
- QPair<int, int> readFrameRate() {
- QList<QString> parts = conf->value("fps").toString().trimmed().split("/");
+ QPair<int, int> readFrameRate(const QString& key) {
+ QList<QString> parts = conf->value(key).toString().trimmed().split("/");
return qMakePair<int, int>(parts[0].toInt(), parts[1].toInt());
}
QStringList presets = d_ptr->conf->value("image/presets").toStringList();
foreach (const QString& preset, presets) {
d_ptr->conf->beginGroup(preset);
- QPair<int, int> fps = d_ptr->readFrameRate();
+
+ QPair<int, int> fps = d_ptr->readFrameRate("fps");
+ QPair<int, int> 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();
}
}
QStringList presets = d_ptr->conf->value("video/presets").toStringList();
foreach (const QString& preset, presets) {
d_ptr->conf->beginGroup(preset);
- QPair<int, int> fps = d_ptr->readFrameRate();
+
+ QPair<int, int> fps = d_ptr->readFrameRate("fps");
+ QPair<int, int> 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();
}
}
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;
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) :
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() {
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;
}
QPair<int, int> QtCamImageSettings::frameRate() const {
return qMakePair<int, int>(d_ptr->numerator, d_ptr->denominator);
}
+
+QPair<int, int> QtCamImageSettings::nightFrameRate() const {
+ return qMakePair<int, int>(d_ptr->nightNumerator, d_ptr->nightDenominator);
+}
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);
QSize viewfinderResolution() const;
QSize previewResolution() const;
QPair<int, int> frameRate() const;
+ QPair<int, int> nightFrameRate() const;
private:
QtCamImageSettingsPrivate *d_ptr;
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;
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) :
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() {
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;
}
QPair<int, int> QtCamVideoSettings::frameRate() const {
return qMakePair<int, int>(d_ptr->numerator, d_ptr->denominator);
}
+
+QPair<int, int> QtCamVideoSettings::nightFrameRate() const {
+ return qMakePair<int, int>(d_ptr->nightNumerator, d_ptr->nightDenominator);
+}
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);
QSize captureResolution() const;
QSize previewResolution() const;
QPair<int, int> frameRate() const;
+ QPair<int, int> nightFrameRate() const;
private:
QtCamVideoSettingsPrivate *d_ptr;