chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uniform audio command back end now rate limited.
[disorder]
/
lib
/
mixer.h
diff --git
a/lib/mixer.h
b/lib/mixer.h
index cfbbce934e71485904f98940473ed48ab45534de..3d4224647d212465c7326cb905b07e5c609d63c8 100644
(file)
--- a/
lib/mixer.h
+++ b/
lib/mixer.h
@@
-2,20
+2,21
@@
* This file is part of DisOrder
* Copyright (C) 2004, 2007 Richard Kettlewell
*
* This file is part of DisOrder
* Copyright (C) 2004, 2007 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
* 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.
* (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
+ * G
NU G
eneral Public License for more details.
+ *
* You should have received a copy of the GNU General Public License
* 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 lib/mixer.h
+ * @brief Mixer support
*/
#ifndef MIXER_H
*/
#ifndef MIXER_H
@@
-26,12
+27,6
@@
struct mixer {
/** @brief API used by this mixer */
int api;
/** @brief API used by this mixer */
int api;
- /** @brief Return non-0 iff @p d is a valid device name */
- int (*validate_device)(const char *d);
-
- /** @brief Return non-0 iff @p c is a valid channel name */
- int (*validate_channel)(const char *c);
-
/** @brief Get the volume
* @param left Where to store left-channel volume
* @param right Where to store right-channel volume
/** @brief Get the volume
* @param left Where to store left-channel volume
* @param right Where to store right-channel volume
@@
-55,13
+50,13
@@
struct mixer {
const char *channel;
};
const char *channel;
};
-int mixer_valid_device(int api, const char *d);
-int mixer_valid_channel(int api, const char *c);
-int mixer_control(int *left, int *right, int set);
+int mixer_control(int api, int *left, int *right, int set);
const char *mixer_default_device(int api);
const char *mixer_default_channel(int api);
const char *mixer_default_device(int api);
const char *mixer_default_channel(int api);
+int mixer_supported(int api);
extern const struct mixer mixer_oss;
extern const struct mixer mixer_oss;
+extern const struct mixer mixer_alsa;
#endif /* MIXER_H */
#endif /* MIXER_H */