Merged new-mixer branch...

This commit is contained in:
Jaroslav Kysela 1999-03-08 16:51:36 +00:00
parent e54aada1a6
commit c0e741dd8a
12 changed files with 307 additions and 19 deletions

View file

@ -4,7 +4,7 @@ sysinclude_HEADERS = asoundlib.h
# This is the order they will be concatenated into asoundlib.h!
#
header_files=header.h version.h error.h control.h mixer.h pcm.h rawmidi.h \
seq.h footer.h
timer.h seq.h footer.h
noinst_HEADERS=$(header_files)

View file

@ -8,8 +8,10 @@
typedef struct snd_mixer_callbacks {
void *private_data; /* should be used by application */
void (*channel_was_changed) (void *private_data, int channel);
void (*output_channel_was_changed) (void *private_data, int channel);
void (*input_channel_was_changed) (void *private_data, int channel);
void (*switch_was_changed) (void *private_data, int switchn);
void *reserved[14]; /* reserved for future use - must be NULL!!! */
void *reserved[15]; /* reserved for future use - must be NULL!!! */
} snd_mixer_callbacks_t;
#ifdef __cplusplus
@ -24,10 +26,14 @@ int snd_mixer_info(void *handle, snd_mixer_info_t * info);
int snd_mixer_exact_mode(void *handle, int enable);
int snd_mixer_channel(void *handle, const char *channel_id);
int snd_mixer_channel_info(void *handle, int channel, snd_mixer_channel_info_t * info);
int snd_mixer_channel_output_info(void *handle, int channel, snd_mixer_channel_direction_info_t * info);
int snd_mixer_channel_input_info(void *handle, int channel, snd_mixer_channel_direction_info_t * info);
int snd_mixer_channel_read(void *handle, int channel, snd_mixer_channel_t * data);
int snd_mixer_channel_write(void *handle, int channel, snd_mixer_channel_t * data);
int snd_mixer_channel_record_read(void *handle, int channel, snd_mixer_channel_t * data);
int snd_mixer_channel_record_write(void *handle, int channel, snd_mixer_channel_t * data);
int snd_mixer_channel_output_read(void *handle, int channel, snd_mixer_channel_direction_t * data);
int snd_mixer_channel_output_write(void *handle, int channel, snd_mixer_channel_direction_t * data);
int snd_mixer_channel_input_read(void *handle, int channel, snd_mixer_channel_direction_t * data);
int snd_mixer_channel_input_write(void *handle, int channel, snd_mixer_channel_direction_t * data);
int snd_mixer_switches(void *handle);
int snd_mixer_switch_read(void *handle, int switchn, snd_mixer_switch_t * data);
int snd_mixer_switch_write(void *handle, int switchn, snd_mixer_switch_t * data);

28
include/timer.h Normal file
View file

@ -0,0 +1,28 @@
/****************************************************************************
* *
* timer.h *
* Timer interface *
* *
****************************************************************************/
#ifdef __cplusplus
extern "C" {
#endif
int snd_timer_open(void **handle);
int snd_timer_close(void *handle);
int snd_timer_file_descriptor(void *handle);
int snd_timer_general_info(void *handle, snd_timer_general_info_t * info);
int snd_timer_select(void *handle, snd_timer_select_t *tselect);
int snd_timer_info(void *handle, snd_timer_info_t *timer);
int snd_timer_params(void *handle, snd_timer_params_t *params);
int snd_timer_status(void *handle, snd_timer_status_t *status);
int snd_timer_start(void *handle);
int snd_timer_stop(void *handle);
int snd_timer_continue(void *handle);
ssize_t snd_timer_read(void *handle, void *buffer, size_t size);
#ifdef __cplusplus
}
#endif