diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:58:02 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-11-20 10:58:02 -0200 |
| commit | 4bed69bfcb36161bcd89a7a61b6a912c32fea813 (patch) | |
| tree | b40092bb4cc41424343b1a4fd3d90b63f7f01fb3 /v4l2-apps/util/qv4l2/qv4l2.h | |
| parent | f7addb7035dedd9ba701c586fec16b234dde4a77 (diff) | |
| parent | c6f9ed52d0eb5d04c1c65914976d81315a872839 (diff) | |
| download | mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.gz mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.bz2 | |
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/util/qv4l2/qv4l2.h')
| -rw-r--r-- | v4l2-apps/util/qv4l2/qv4l2.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/v4l2-apps/util/qv4l2/qv4l2.h b/v4l2-apps/util/qv4l2/qv4l2.h index 1a0a8e15d..805c5d612 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.h +++ b/v4l2-apps/util/qv4l2/qv4l2.h @@ -59,12 +59,14 @@ protected: void closeEvent( QCloseEvent* ); private slots: + void selectdev(int); void choose(); void ctrlAction(int); void about(); private: + void add_dirVideoDevice(char *dirname); void addTabs(); void finishGrid(QWidget *vbox, QGrid *grid, unsigned ctrl_class, bool odd); void addCtrl(QGrid *grid, const struct v4l2_queryctrl &qctrl); @@ -88,6 +90,7 @@ private: QString filename; QSignalMapper *sigMapper; QTabWidget *tabs; + QPopupMenu *videoDevice; int fd; CtrlMap ctrlMap; WidgetMap widgetMap; |