summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Holst <holstsn@users.sourceforge.net>2003-07-24 15:51:09 +0000
committerStefan Holst <holstsn@users.sourceforge.net>2003-07-24 15:51:09 +0000
commit0c68d092f36d8f714be4f9a359097e06f6a65af7 (patch)
treeff69ee5db751a559bfe31b906a3eae750b46130f
parente73b1dcf5ee8b47d023e4242fd91f0c5a66d9e34 (diff)
downloadxine-lib-0c68d092f36d8f714be4f9a359097e06f6a65af7.tar.gz
xine-lib-0c68d092f36d8f714be4f9a359097e06f6a65af7.tar.bz2
make input_v4l compile even without alsa
CVS patchset: 5210 CVS date: 2003/07/24 15:51:09
-rw-r--r--src/input/input_v4l.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index aa257d032..d96c7f485 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1350,10 +1350,11 @@ static buf_element_t *v4l_plugin_read_block (input_plugin_t *this_gen,
ptr = this->video_buf + this->gb_buffers.offsets[this->gb_frame];
buf->pts = get_time(); /* this->stream->xine->clock->get_current_time(this->stream->xine->clock); */
xine_fast_memcpy (buf->content, ptr, this->frame_size);
- } else if (this->audio_capture) {
-
+ }
#ifdef HAVE_ALSA
- /* Record audio */
+ else if (this->audio_capture) {
+
+ /* Record audio */
int pcmreturn;
if ((pcmreturn = snd_pcm_mmap_readi(this->pcm_handle, this->pcm_data, (periodsize)>> 2)) < 0) {
@@ -1414,8 +1415,8 @@ static buf_element_t *v4l_plugin_read_block (input_plugin_t *this_gen,
xine_fast_memcpy(buf->content, this->pcm_data, periodsize);
}
-#endif
}
+#endif
DBGPRINT("read block done\n");