qv4l2: fix querystd and query_dv_timings

Error messages in case of a missing signal were not displayed, and the
querystd return code check was inverted.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp
index 49895cf..74534d0 100644 (file)
--- a/utils/qv4l2/general-tab.cpp
+++ b/utils/qv4l2/general-tab.cpp
@@ -1750,7 +1750,7 @@ void GeneralTab::qryStdClicked()
 {
        v4l2_std_id std;
 
-       if (!query_std(std))
+       if (query_std(std))
                return;
 
        if (std == V4L2_STD_UNKNOWN) {
@@ -1813,10 +1813,25 @@ void GeneralTab::updateTimings()
 void GeneralTab::qryTimingsClicked()
 {
        v4l2_dv_timings timings;
+       int err = query_dv_timings(timings);
 
-       if (!query_dv_timings(timings)) {
+       switch (err) {
+       case ENOLINK:
+               info("No signal found\n");
+               break;
+       case ENOLCK:
+               info("Could not lock to signal\n");
+               break;
+       case ERANGE:
+               info("Frequency out of range\n");
+               break;
+       case 0:
                s_dv_timings(timings);
                updateTimings();
+               break;
+       default:
+               error(err);
+               break;
        }
 }
 

diff --git a/utils/qv4l2/general-tab.h b/utils/qv4l2/general-tab.h
index b1b2e5b..ac9868e 100644 (file)
--- a/utils/qv4l2/general-tab.h
+++ b/utils/qv4l2/general-tab.h
@@ -182,6 +182,10 @@ private:
        {
                g_mw->error(error);
        }
+       virtual void error(int error)
+       {
+               g_mw->error(error);
+       }
        v4l_fd *g_v4l_fd() { return m_fd->g_v4l_fd(); }
 
        __u32 g_type() const { return m_fd->g_type(); }