summaryrefslogtreecommitdiff
path: root/v4l2-apps/util/qv4l2
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-05 18:53:47 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-05 18:53:47 -0200
commitfcb54f0fe6b8b57da03ef141b114f7c7be226dfd (patch)
treecac1c5245486aecf953562a7ab4bf1184f4a5bcd /v4l2-apps/util/qv4l2
parentf6446935a2e144e7f845a951e80a9bf2d313ffda (diff)
parent76a1e5c0858e7b49c63708f044276f5142534b4b (diff)
downloadmediapointer-dvb-s2-fcb54f0fe6b8b57da03ef141b114f7c7be226dfd.tar.gz
mediapointer-dvb-s2-fcb54f0fe6b8b57da03ef141b114f7c7be226dfd.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tda18271c2
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util/qv4l2')
-rw-r--r--v4l2-apps/util/qv4l2/general-tab.cpp24
-rw-r--r--v4l2-apps/util/qv4l2/general-tab.h3
-rw-r--r--v4l2-apps/util/qv4l2/qv4l2.cpp2
3 files changed, 26 insertions, 3 deletions
diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp
index 93ab329ba..d7f5a98d2 100644
--- a/v4l2-apps/util/qv4l2/general-tab.cpp
+++ b/v4l2-apps/util/qv4l2/general-tab.cpp
@@ -31,7 +31,7 @@
#include <sys/ioctl.h>
#include <errno.h>
-GeneralTab::GeneralTab(int _fd, int n, QWidget *parent) :
+GeneralTab::GeneralTab(const char *device, int _fd, int n, QWidget *parent) :
QGrid(n, parent),
fd(_fd)
{
@@ -39,6 +39,28 @@ GeneralTab::GeneralTab(int _fd, int n, QWidget *parent) :
setSpacing(3);
+ memset(&querycap, 0, sizeof(querycap));
+ if (ioctl(fd, VIDIOC_QUERYCAP, &querycap) >=0) {
+ QLabel *l1 = new QLabel("Device:", this);
+ QLabel *l1t = new QLabel(device, this);
+ l1->setAlignment(Qt::AlignRight);
+
+ QLabel *l2 = new QLabel("Driver:", this);
+ l2->setAlignment(Qt::AlignRight);
+
+ QLabel *l2t = new QLabel((char *)querycap.driver, this);
+
+ QLabel *l3 = new QLabel("Card:", this);
+ l3->setAlignment(Qt::AlignRight);
+
+ QLabel *l3t = new QLabel((char *)querycap.card, this);
+
+ QLabel *l4 = new QLabel("Bus:", this);
+ l4->setAlignment(Qt::AlignRight);
+
+ QLabel *l4t = new QLabel((char *)querycap.bus_info, this);
+ }
+
memset(&tuner, 0, sizeof(tuner));
ioctl(fd, VIDIOC_G_TUNER, &tuner);
if (tuner.rangehigh>INT_MAX)
diff --git a/v4l2-apps/util/qv4l2/general-tab.h b/v4l2-apps/util/qv4l2/general-tab.h
index 110632014..8130e11e1 100644
--- a/v4l2-apps/util/qv4l2/general-tab.h
+++ b/v4l2-apps/util/qv4l2/general-tab.h
@@ -33,7 +33,7 @@ class GeneralTab: public QGrid
Q_OBJECT
public:
- GeneralTab(int fd, int n, QWidget *parent = 0);
+ GeneralTab(const char *device, int fd, int n, QWidget *parent = 0);
virtual ~GeneralTab() {}
private slots:
@@ -57,6 +57,7 @@ private:
int fd;
struct v4l2_tuner tuner;
+ struct v4l2_capability querycap;
// General tab
QComboBox *videoInput;
diff --git a/v4l2-apps/util/qv4l2/qv4l2.cpp b/v4l2-apps/util/qv4l2/qv4l2.cpp
index f9fb07e09..a93608af2 100644
--- a/v4l2-apps/util/qv4l2/qv4l2.cpp
+++ b/v4l2-apps/util/qv4l2/qv4l2.cpp
@@ -118,7 +118,7 @@ void ApplicationWindow::setDevice(const QString &device)
fd = ::open(device, O_RDONLY);
if (fd >= 0) {
- tabs->addTab(new GeneralTab(fd, 4, tabs), "General");
+ tabs->addTab(new GeneralTab(device, fd, 4, tabs), "General");
addTabs();
}
if (QWidget *current = tabs->currentPage()) {