Restore uaudio_apis[], but in a separate executable to avoid everything

[disorder] / lib / alsabg.h

diff --git a/lib/alsabg.h b/lib/alsabg.h
index 0ef9c59f75d79151fea94627374426739db8b47a..78c83dc156a01d2384d41f661e613475ee90769e 100644 (file)
--- a/lib/alsabg.h
+++ b/lib/alsabg.h
@@ -2,20 +2,18 @@
  * This file is part of DisOrder.
  * Copyright (C) 2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * 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
+ * the Free Software Foundation, either version 3 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.
- *
+ * 
+ * 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-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 /** @file alsabg.h
  * @brief Background-thread interface to ALSA
@@ -31,15 +29,16 @@
 /** @brief Supply audio callback
  * @param dst Where to write audio data
  * @param nsamples Number of samples to write
+ * @return Number of samples written
  *
  * This function should write up to @p *nsamples samples of data at
  * @p dst, and return the number of samples written, or -1 if some error
  * occurred.  It will be called in a background thread.
  */
 typedef int alsa_bg_supply(void *dst,
-                          unsigned nsamples);
+                          unsigned nsamples_max);
 
-void alsa_bg_init(const char *device,
+void alsa_bg_init(const char *dev,
                  alsa_bg_supply *supply);
 
 void alsa_bg_enable(void);