Update of /cvsroot/alsa/alsa-lib/include
In directory sc8-pr-cvs1:/tmp/cvs-serv7118/include
Modified Files:
Makefile.am asoundlib.h mixer_simple.h pcm_simple.h
Log Message:
Added simple_mixer and simple_pcm subdirs with some 'empty' code
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/include/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- Makefile.am 22 Oct 2002 20:20:05 -0000 1.47
+++ Makefile.am 22 Jun 2003 18:09:03 -0000 1.48
@@ -8,7 +8,8 @@
conf.h pcm.h pcm_plugin.h rawmidi.h timer.h \
hwdep.h control.h mixer.h \
seq_event.h seq.h seqmid.h seq_midi_event.h \
- conv.h instr.h iatomic.h
+ conv.h instr.h iatomic.h \
+ pcm_simple.h mixer_simple.h
noinst_HEADERS = sys.h search.h list.h aserver.h local.h alsa-symbols.h
Index: asoundlib.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/include/asoundlib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- asoundlib.h 30 Dec 2001 09:22:54 -0000 1.2
+++ asoundlib.h 22 Jun 2003 18:09:03 -0000 1.3
@@ -4,7 +4,7 @@
* \author Jaroslav Kysela <[EMAIL PROTECTED]>
* \author Abramo Bagnara <[EMAIL PROTECTED]>
* \author Takashi Iwai <[EMAIL PROTECTED]>
- * \date 1998-2001
+ * \date 1998-2003
*
* Application interface library for the ALSA driver
*
Index: mixer_simple.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/include/mixer_simple.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixer_simple.h 21 Jun 2003 08:55:40 -0000 1.1
+++ mixer_simple.h 22 Jun 2003 18:09:03 -0000 1.2
@@ -27,9 +27,15 @@
#ifndef __ALSA_MIXER_SIMPLE_H
#define __ALSA_MIXER_SIMPLE_H
+#include <alsa/asoundlib.h>
+
/** Simple Mixer latency type */
enum snds_mixer_io_type {
+ /*
+ * playback section
+ */
+
/** master volume - left (0-1000) */
SNDS_MIO_MASTER_LVOL = 0,
/** master volume - right (0-1000) */
@@ -66,6 +72,9 @@
/** CD volume - right mute (0 = off, 1 = on) */
SNDS_MIO_AUX_RMUTE,
+ /*
+ * capture section
+ */
/** capture gain - left (0-1000) */
SNDS_MIO_CGAIN_LVOL = 0x1000,
@@ -85,6 +94,8 @@
SNDS_MIO_CSOURCE_MIX
};
+typedef struct snds_mixer snds_mixer_t;
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -95,14 +106,13 @@
* \{
*/
-int snds_mixer_open(snds_mixer_t **pcm, const char *playback_name, const char
*capture_name);
-int snds_mixer_open_lconf(snds_mixer_t **pcm, const char *plaback_name, const char
*capture_name, snd_config_t *lconf);
-int snds_mixer_close(snds_mixer_t *pcm);
-int snds_mixer_poll_descriptors_count(snds_mixer_t *pcm);
-int snds_mixer_poll_descriptors(snds_mixer_t *pcm, struct pollfd *pfds, unsigned int
space);
-int snds_mixer_poll_descriptors_revents(snds_mixer_t *pcm, struct pollfd *pfds,
unsigned int nfds, unsigned short *revents);
-int snds_mixer_io_get(snds_mixer_t *pcm, enum snds_mixer_io_type type, int *val);
-int snds_mixer_io_set(snds_mixer_t *pcm, enum snds_mixer_io_type type, int val);
+int snds_mixer_open(snds_mixer_t **pmixer, const char *playback_name, const char
*capture_name, snd_config_t *lconf);
+int snds_mixer_close(snds_mixer_t *mixer);
+int snds_mixer_poll_descriptors_count(snds_mixer_t *mixer);
+int snds_mixer_poll_descriptors(snds_mixer_t *mixer, struct pollfd *pfds, unsigned
int space);
+int snds_mixer_poll_descriptors_revents(snds_mixer_t *mixer, struct pollfd *pfds,
unsigned int nfds, unsigned short *revents);
+int snds_mixer_io_get(snds_mixer_t *mixer, enum snds_mixer_io_type type, int *val);
+int snds_mixer_io_set(snds_mixer_t *mixer, enum snds_mixer_io_type type, int val);
int snds_mixer_io_change(snds_mixer_t *mixer, enum snds_mixer_io_type *changed, int
changed_array_size);
/** \} */
Index: pcm_simple.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/include/pcm_simple.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcm_simple.h 22 Jun 2003 14:46:15 -0000 1.3
+++ pcm_simple.h 22 Jun 2003 18:09:03 -0000 1.4
@@ -27,7 +27,7 @@
#ifndef __ALSA_PCM_SIMPLE_H
#define __ALSA_PCM_SIMPLE_H
-#include <alsa/pcm.h>
+#include <alsa/asoundlib.h>
/** Simple PCM latency type */
enum snds_pcm_latency_type {
@@ -58,6 +58,8 @@
SNDS_PCM_XRUN_STOP
};
+typedef struct snds_pcm snds_pcm_t;
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -77,7 +79,7 @@
int snds_pcm_drop(snds_pcm_t *pcm);
int snds_pcm_drain(snds_pcm_t *pcm);
int snds_pcm_delay(snds_pcm_t *pcm, snd_pcm_sframes_t *delayp);
-int snds_pcm_resume(snd_pcm_t *pcm);
+int snds_pcm_resume(snds_pcm_t *pcm);
int snds_pcm_wait(snds_pcm_t *pcm, int timeout);
snd_pcm_t *snds_pcm_raw_playback(snds_pcm_t *pcm);
snd_pcm_t *snds_pcm_raw_capture(snds_pcm_t *pcm);
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
