diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-26 08:47:12 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-26 08:47:12 +0100 |
| commit | 891faaaa42567c3609045cff7972d61268b53b8e (patch) | |
| tree | 96dd8ac4262bb382966109878286aa8388103e05 /v4l2-apps | |
| parent | d6fee5ac91e4b7196341e6da1708ce5b4481cd79 (diff) | |
| parent | 1f3f7671e12715041b3b002db1403ce4da682fda (diff) | |
| download | mediapointer-dvb-s2-891faaaa42567c3609045cff7972d61268b53b8e.tar.gz mediapointer-dvb-s2-891faaaa42567c3609045cff7972d61268b53b8e.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'v4l2-apps')
| -rw-r--r-- | v4l2-apps/util/qv4l2/qv4l2.cpp | 8 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/qv4l2.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/v4l2-apps/util/qv4l2/qv4l2.cpp b/v4l2-apps/util/qv4l2/qv4l2.cpp index eb1506531..d144723d9 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.cpp +++ b/v4l2-apps/util/qv4l2/qv4l2.cpp @@ -136,13 +136,13 @@ void ApplicationWindow::selectdev(int index) setDevice(videoDevice->text(index)); } -void ApplicationWindow::add_dirVideoDevice(char *dirname) +void ApplicationWindow::add_dirVideoDevice(const char *dirname) { DIR *dir; struct dirent *entry; - char *vid = "video"; - char *rad = "radio"; - char *vbi = "vbi"; + const char *vid = "video"; + const char *rad = "radio"; + const char *vbi = "vbi"; char name[512], *p; dir = opendir(dirname); diff --git a/v4l2-apps/util/qv4l2/qv4l2.h b/v4l2-apps/util/qv4l2/qv4l2.h index 805c5d612..5421a867d 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.h +++ b/v4l2-apps/util/qv4l2/qv4l2.h @@ -66,7 +66,7 @@ private slots: void about(); private: - void add_dirVideoDevice(char *dirname); + void add_dirVideoDevice(const char *dirname); void addTabs(); void finishGrid(QWidget *vbox, QGrid *grid, unsigned ctrl_class, bool odd); void addCtrl(QGrid *grid, const struct v4l2_queryctrl &qctrl); |