summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2014-09-20 19:18:08 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2014-09-20 19:18:08 +0200
commitd6c86e2037dae147bb0292b9da109614872a99d7 (patch)
treeedf300527792e5b47f5103f0dd487efd6d5031f0 /src
parentb6e930afb15717e144ec5f526bce88a32f9ab9e5 (diff)
Make it possible to disable audio and/or video input.
Diffstat (limited to 'src')
-rw-r--r--src/audioinputhandler.cc4
-rw-r--r--src/v4l.cc4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/audioinputhandler.cc b/src/audioinputhandler.cc
index e17fce2..95517f6 100644
--- a/src/audioinputhandler.cc
+++ b/src/audioinputhandler.cc
@@ -32,7 +32,9 @@ AudioInputHandler::AudioInputHandler(QString device)
: ai(device.toStdString().c_str())
{
qRegisterMetaType<framelist_t>("framelist_t");
- start();
+
+ // Only start if we actually have an audio interface
+ if(device != "") start();
}
AudioInputHandler::~AudioInputHandler()
diff --git a/src/v4l.cc b/src/v4l.cc
index 246026f..bd193f4 100644
--- a/src/v4l.cc
+++ b/src/v4l.cc
@@ -791,7 +791,9 @@ V4L::V4L(QString device)
v4l = this; // Set global V4L object pointer.
running = true;
- start();
+
+ // Only start if we actually have a video interface.
+ if(device != "") start();
}
V4L::~V4L()