/*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file alsa_write.c paraslash's alsa output plugin */
* based on the vplay program by Michael Beck.
*/
+#include <sys/types.h>
+#include <dirent.h>
+#include <alsa/asoundlib.h>
+
#include "para.h"
#include "fd.h"
#include "string.h"
#include "list.h"
#include "sched.h"
#include "write.h"
-
-#include <alsa/asoundlib.h>
-
#include "alsa_write.cmdline.h"
#include "error.h"
// PARA_INFO_LOG("%zd frames\n", frames);
if (!frames) {
- if (*wng->input_eof)
+ if (*wng->input_error)
wn->written = *wng->loaded;
return 1;
}
return 1;
ret = snd_pcm_writei(pad->handle, data, frames);
if (ret == -EPIPE) {
- PARA_WARNING_LOG("%s", "EPIPE\n");
+ PARA_WARNING_LOG("EPIPE\n");
snd_pcm_prepare(pad->handle);
return 1;
}
- if (ret < 0) {
- PARA_WARNING_LOG("%s", "ALSA ERROR\n");
+ if (ret < 0 && ret != -EAGAIN) {
+ PARA_WARNING_LOG("alsa error (%zu frames, ret = %d\n",
+ frames, (int)ret);
return -E_ALSA_WRITE;
}
- ms2tv(pad->buffer_time / 4000, &tv);
-// ms2tv(1, &tv);
+ if (ret == -EAGAIN) { /* try again in 5ms */
+ PARA_WARNING_LOG("EAGAIN\n");
+ ms2tv(5, &tv);
+ } else {
+ wn->written += ret * pad->bytes_per_frame;
+ ms2tv(pad->buffer_time / 4000, &tv);
+ }
tv_add(now, &tv, &pad->next_chunk);
- wn->written += ret * pad->bytes_per_frame;
return 1;
}