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: when refreshing controls call queryctrl before setVal.
Author:  Hans Verkuil <hverk...@xs4all.nl>
Date:    Sat Apr 24 13:41:21 2010 +0200

setVal relies on correct control flags for the setWhat() call. So
we must update the control flags before calling setVal.

Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

 utils/qv4l2/ctrl-tab.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=e1f27f003943e86526fa1174754f7a256a6ad56c

diff --git a/utils/qv4l2/ctrl-tab.cpp b/utils/qv4l2/ctrl-tab.cpp
index 6112e99..831edc8 100644
--- a/utils/qv4l2/ctrl-tab.cpp
+++ b/utils/qv4l2/ctrl-tab.cpp
@@ -519,8 +519,8 @@ void ApplicationWindow::refresh(unsigned ctrl_class)
                        if (ioctl(VIDIOC_G_CTRL, &c)) {
                                errorCtrl(id, errno);
                        }
-                       setVal(id, c.value);
                        queryctrl(m_ctrlMap[id]);
+                       setVal(id, c.value);
                        m_widgetMap[id]->setDisabled(m_ctrlMap[id].flags & 
CTRL_FLAG_DISABLED);
                }
                return;
@@ -559,6 +559,7 @@ void ApplicationWindow::refresh(unsigned ctrl_class)
                for (unsigned i = 0; i < ctrls.count; i++) {
                        unsigned id = c[i].id;
                        
+                       queryctrl(m_ctrlMap[id]);
                        if (m_ctrlMap[id].type == V4L2_CTRL_TYPE_INTEGER64)
                                setVal64(id, c[i].value64);
                        else if (m_ctrlMap[id].type == V4L2_CTRL_TYPE_STRING) {
@@ -567,7 +568,6 @@ void ApplicationWindow::refresh(unsigned ctrl_class)
                        }
                        else
                                setVal(id, c[i].value);
-                       queryctrl(m_ctrlMap[id]);
                        m_widgetMap[id]->setDisabled(m_ctrlMap[id].flags & 
CTRL_FLAG_DISABLED);
                }
        }

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to