This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: qv4l2: changing the preset/std should also update the format. Author: Hans Verkuil <[email protected]> Date: Mon Aug 22 15:28:06 2011 +0200 And as a bonus fix the interval combobox was not disabled when it should. Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit 224261c27e86eb19cf9d75b44caee67105f956e8) Signed-off-by: Gregor Jasny <[email protected]> utils/qv4l2/general-tab.cpp | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=1b5b7f7ceb37b4506f072405995e117a78649da8 diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp index 5718e68..a306f16 100644 --- a/utils/qv4l2/general-tab.cpp +++ b/utils/qv4l2/general-tab.cpp @@ -69,7 +69,6 @@ GeneralTab::GeneralTab(const QString &device, v4l2 &fd, int n, QWidget *parent) } while (enum_std(vs)); addWidget(m_tvStandard); connect(m_tvStandard, SIGNAL(activated(int)), SLOT(standardChanged(int))); - updateStandard(); } v4l2_dv_enum_preset preset; @@ -81,7 +80,6 @@ GeneralTab::GeneralTab(const QString &device, v4l2 &fd, int n, QWidget *parent) } while (enum_dv_preset(preset)); addWidget(m_videoPreset); connect(m_videoPreset, SIGNAL(activated(int)), SLOT(presetChanged(int))); - updatePreset(); } v4l2_input vin; @@ -196,6 +194,11 @@ GeneralTab::GeneralTab(const QString &device, v4l2 &fd, int n, QWidget *parent) addWidget(m_frameInterval); connect(m_frameInterval, SIGNAL(activated(int)), SLOT(frameIntervalChanged(int))); + if (m_tvStandard) + updateStandard(); + if (m_videoPreset) + updatePreset(); + updateVidCapFormat(); if (caps() & V4L2_CAP_VIDEO_OUTPUT) { @@ -490,6 +493,7 @@ void GeneralTab::updateStandard() vs.frameperiod.numerator, vs.frameperiod.denominator, vs.framelines); m_tvStandard->setWhatsThis(what); + updateVidCapFormat(); } void GeneralTab::updatePreset() @@ -512,6 +516,7 @@ void GeneralTab::updatePreset() "Frame %ux%u\n", p.preset, p.width, p.height); m_videoPreset->setWhatsThis(what); + updateVidCapFormat(); } void GeneralTab::updateFreq() @@ -609,6 +614,7 @@ void GeneralTab::updateFrameInterval() m_frameInterval->clear(); ok = enum_frameintervals(frmival, m_pixelformat, m_width, m_height); + m_frameInterval->setEnabled(ok); curr_ok = get_interval(curr); if (ok && frmival.type == V4L2_FRMIVAL_TYPE_DISCRETE) { do { _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
