mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-12-15 08:56:36 -05:00
Corrections by Kevin Conder <kconder@interaccess.com>
This commit is contained in:
parent
b559c97833
commit
853304bbf4
39 changed files with 386 additions and 386 deletions
|
|
@ -6,7 +6,7 @@
|
|||
* \author Takashi Iwai <tiwai@suse.de>
|
||||
* \date 1998-2001
|
||||
*
|
||||
* Definitions of constatns for the ALSA driver
|
||||
* Definitions of constants for the ALSA driver
|
||||
*
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or modify
|
||||
|
|
@ -33,7 +33,7 @@ extern "C" {
|
|||
#endif
|
||||
|
||||
/**
|
||||
* \defgroup Digital_Audio_Interface Contants For Digital Audio Interface
|
||||
* \defgroup Digital_Audio_Interface Constants For Digital Audio Interface
|
||||
* AES/IEC958 channel status bits
|
||||
* \{
|
||||
*/
|
||||
|
|
@ -228,10 +228,10 @@ extern "C" {
|
|||
#define MIDI_CTL_E5_PHASER_DEPTH 0x5f /**< E5 Phaser Depth */
|
||||
#define MIDI_CTL_DATA_INCREMENT 0x60 /**< Data Increment */
|
||||
#define MIDI_CTL_DATA_DECREMENT 0x61 /**< Data Decrement */
|
||||
#define MIDI_CTL_NONREG_PARM_NUM_LSB 0x62 /**< Nonregister parameter number */
|
||||
#define MIDI_CTL_NONREG_PARM_NUM_MSB 0x63 /**< Nonregister parameter number */
|
||||
#define MIDI_CTL_REGIST_PARM_NUM_LSB 0x64 /**< Register parameter number */
|
||||
#define MIDI_CTL_REGIST_PARM_NUM_MSB 0x65 /**< Register parameter number */
|
||||
#define MIDI_CTL_NONREG_PARM_NUM_LSB 0x62 /**< Non-registered parameter number */
|
||||
#define MIDI_CTL_NONREG_PARM_NUM_MSB 0x63 /**< Non-registered parameter number */
|
||||
#define MIDI_CTL_REGIST_PARM_NUM_LSB 0x64 /**< Registered parameter number */
|
||||
#define MIDI_CTL_REGIST_PARM_NUM_MSB 0x65 /**< Registered parameter number */
|
||||
#define MIDI_CTL_ALL_SOUNDS_OFF 0x78 /**< All sounds off */
|
||||
#define MIDI_CTL_RESET_CONTROLLERS 0x79 /**< Reset Controllers */
|
||||
#define MIDI_CTL_LOCAL_CONTROL_SWITCH 0x7a /**< Local control switch */
|
||||
|
|
|
|||
|
|
@ -53,10 +53,10 @@ typedef struct snd_aes_iec958 {
|
|||
/** CTL card info container */
|
||||
typedef struct _snd_ctl_card_info snd_ctl_card_info_t;
|
||||
|
||||
/** CTL element identificator container */
|
||||
/** CTL element identifier container */
|
||||
typedef struct _snd_ctl_elem_id snd_ctl_elem_id_t;
|
||||
|
||||
/** CTL element identificator list container */
|
||||
/** CTL element identifier list container */
|
||||
typedef struct _snd_ctl_elem_list snd_ctl_elem_list_t;
|
||||
|
||||
/** CTL element info container */
|
||||
|
|
@ -396,9 +396,9 @@ void snd_ctl_elem_value_get_iec958(const snd_ctl_elem_value_t *obj, snd_aes_iec9
|
|||
void snd_ctl_elem_value_set_iec958(snd_ctl_elem_value_t *obj, const snd_aes_iec958_t *ptr);
|
||||
|
||||
/**
|
||||
* \defgroup HControl Highlevel Control Interface
|
||||
* \defgroup HControl High level Control Interface
|
||||
* \ingroup Control
|
||||
* The highlevel control interface.
|
||||
* The high level control interface.
|
||||
* See \ref hcontrol page for more details.
|
||||
* \{
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1040,7 +1040,7 @@ static __inline__ void atomic_clear_mask(unsigned long mask, unsigned long *addr
|
|||
/*
|
||||
* non supported architecture.
|
||||
*/
|
||||
#warning "Atomic operations are not supported on this archictecture."
|
||||
#warning "Atomic operations are not supported on this architecture."
|
||||
|
||||
typedef struct { volatile int counter; } atomic_t;
|
||||
|
||||
|
|
@ -1066,17 +1066,17 @@ typedef struct { volatile int counter; } atomic_t;
|
|||
* Copyright (c) 2001 by Abramo Bagnara <abramo@alsa-project.org>
|
||||
*/
|
||||
|
||||
/* Max number of times we must spin on a spinlock calling sched_yield().
|
||||
/* Max number of times we must spin on a spin-lock calling sched_yield().
|
||||
After MAX_SPIN_COUNT iterations, we put the calling thread to sleep. */
|
||||
|
||||
#ifndef MAX_SPIN_COUNT
|
||||
#define MAX_SPIN_COUNT 50
|
||||
#endif
|
||||
|
||||
/* Duration of sleep (in nanoseconds) when we can't acquire a spinlock
|
||||
/* Duration of sleep (in nanoseconds) when we can't acquire a spin-lock
|
||||
after MAX_SPIN_COUNT iterations of sched_yield().
|
||||
This MUST BE > 2ms.
|
||||
(Otherwise the kernel does busy-waiting for realtime threads,
|
||||
(Otherwise the kernel does busy-waiting for real-time threads,
|
||||
giving other threads no chance to run.) */
|
||||
|
||||
#ifndef SPIN_SLEEP_DURATION
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ snd_mixer_elem_type_t snd_mixer_elem_get_type(const snd_mixer_elem_t *obj);
|
|||
|
||||
/* Simple (legacy) mixer elements API */
|
||||
|
||||
/** Mixer simple element channel identificator */
|
||||
/** Mixer simple element channel identifier */
|
||||
typedef enum _snd_mixer_selem_channel_id {
|
||||
/** Unknown */
|
||||
SND_MIXER_SCHN_UNKNOWN = -1,
|
||||
|
|
@ -139,7 +139,7 @@ typedef enum _snd_mixer_selem_channel_id {
|
|||
SND_MIXER_SCHN_MONO = SND_MIXER_SCHN_FRONT_LEFT
|
||||
} snd_mixer_selem_channel_id_t;
|
||||
|
||||
/** Mixer simple element identificator */
|
||||
/** Mixer simple element identifier */
|
||||
typedef struct _snd_mixer_selem_id snd_mixer_selem_id_t;
|
||||
|
||||
const char *snd_mixer_selem_channel_name(snd_mixer_selem_channel_id_t channel);
|
||||
|
|
|
|||
|
|
@ -938,7 +938,7 @@ int16_t *snd_pcm_scope_s16_get_channel_buffer(snd_pcm_scope_t *scope,
|
|||
* \{
|
||||
*/
|
||||
|
||||
/* Deprecated functions, for compatibity */
|
||||
/* Deprecated functions, for compatibility */
|
||||
const char *snd_pcm_start_mode_name(snd_pcm_start_t mode);
|
||||
const char *snd_pcm_xrun_mode_name(snd_pcm_xrun_t mode);
|
||||
int snd_pcm_sw_params_set_start_mode(snd_pcm_t *pcm, snd_pcm_sw_params_t *params, snd_pcm_start_t val);
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ struct _ENTRY;
|
|||
|
||||
/* Family of hash table handling functions. The functions also
|
||||
have reentrant counterparts ending with _r. The non-reentrant
|
||||
functions all work on a signle internal hashing table. */
|
||||
functions all work on a single internal hashing table. */
|
||||
|
||||
/* Search for entry matching ITEM.key in internal hash table. If
|
||||
ACTION is `FIND' return found entry or signal error by returning
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ typedef enum _snd_seq_type {
|
|||
/** known client numbers */
|
||||
#define SND_SEQ_CLIENT_SYSTEM 0 /**< system client */
|
||||
#define SND_SEQ_CLIENT_DUMMY 62 /**< dummy ports */
|
||||
#define SND_SEQ_CLIENT_OSS 63 /**< oss sequencer emulator */
|
||||
#define SND_SEQ_CLIENT_OSS 63 /**< OSS sequencer emulator */
|
||||
|
||||
/*
|
||||
*/
|
||||
|
|
@ -211,7 +211,7 @@ typedef struct _snd_seq_port_info snd_seq_port_info_t;
|
|||
|
||||
/** known port numbers */
|
||||
#define SND_SEQ_PORT_SYSTEM_TIMER 0 /**< system timer port */
|
||||
#define SND_SEQ_PORT_SYSTEM_ANNOUNCE 1 /**< sysem announce port */
|
||||
#define SND_SEQ_PORT_SYSTEM_ANNOUNCE 1 /**< system announce port */
|
||||
|
||||
/** port capabilities (32 bits) */
|
||||
#define SND_SEQ_PORT_CAP_READ (1<<0) /**< readable from this port */
|
||||
|
|
@ -550,7 +550,7 @@ int snd_seq_remove_events(snd_seq_t *handle, snd_seq_remove_events_t *info);
|
|||
|
||||
/**
|
||||
* \defgroup SeqMisc Sequencer Miscellaneous
|
||||
* Sequencer Mescellaneous
|
||||
* Sequencer Miscellaneous
|
||||
* \ingroup Sequencer
|
||||
* \{
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ enum snd_seq_event_type {
|
|||
SND_SEQ_EVENT_STOP,
|
||||
/** Set tick queue position; event data type = #snd_seq_ev_queue_control_t */
|
||||
SND_SEQ_EVENT_SETPOS_TICK,
|
||||
/** Set realtime queue position; event data type = #snd_seq_ev_queue_control_t */
|
||||
/** Set real-time queue position; event data type = #snd_seq_ev_queue_control_t */
|
||||
SND_SEQ_EVENT_SETPOS_TIME,
|
||||
/** (SMF) Tempo event; event data type = #snd_seq_ev_queue_control_t */
|
||||
SND_SEQ_EVENT_TEMPO,
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ extern "C" {
|
|||
* \param ev event instance
|
||||
* \param q queue id to schedule
|
||||
* \param relative relative time-stamp if non-zero
|
||||
* \param ttick tick time-stap to be delivered
|
||||
* \param ttick tick time-stamp to be delivered
|
||||
*/
|
||||
#define snd_seq_ev_schedule_tick(ev, q, relative, ttick) \
|
||||
((ev)->flags &= ~(SND_SEQ_TIME_STAMP_MASK | SND_SEQ_TIME_MODE_MASK),\
|
||||
|
|
@ -177,7 +177,7 @@ extern "C" {
|
|||
/**
|
||||
* \brief set the start queue event
|
||||
* \param ev event record
|
||||
* \param q queud id to start
|
||||
* \param q queue id to start
|
||||
*/
|
||||
#define snd_seq_ev_set_queue_start(ev, q) \
|
||||
snd_seq_ev_set_queue_control(ev, SND_SEQ_EVENT_START, q, 0)
|
||||
|
|
@ -185,7 +185,7 @@ extern "C" {
|
|||
/**
|
||||
* \brief set the stop queue event
|
||||
* \param ev event record
|
||||
* \param q queud id to stop
|
||||
* \param q queue id to stop
|
||||
*/
|
||||
#define snd_seq_ev_set_queue_stop(ev, q) \
|
||||
snd_seq_ev_set_queue_control(ev, SND_SEQ_EVENT_STOP, q, 0)
|
||||
|
|
@ -193,7 +193,7 @@ extern "C" {
|
|||
/**
|
||||
* \brief set the stop queue event
|
||||
* \param ev event record
|
||||
* \param q queud id to continue
|
||||
* \param q queue id to continue
|
||||
*/
|
||||
#define snd_seq_ev_set_queue_continue(ev, q) \
|
||||
snd_seq_ev_set_queue_control(ev, SND_SEQ_EVENT_CONTINUE, q, 0)
|
||||
|
|
@ -201,7 +201,7 @@ extern "C" {
|
|||
/**
|
||||
* \brief set the stop queue event
|
||||
* \param ev event record
|
||||
* \param q queud id to change tempo
|
||||
* \param q queue id to change tempo
|
||||
* \param val the new tempo value
|
||||
*/
|
||||
#define snd_seq_ev_set_queue_tempo(ev, q, val) \
|
||||
|
|
@ -210,7 +210,7 @@ extern "C" {
|
|||
/**
|
||||
* \brief set the real-time position of a queue
|
||||
* \param ev event record
|
||||
* \param q queud id to change tempo
|
||||
* \param q queue id to change tempo
|
||||
* \param rtime the new real-time pointer
|
||||
*/
|
||||
#define snd_seq_ev_set_queue_pos_real(ev, q, rtime) \
|
||||
|
|
@ -222,7 +222,7 @@ extern "C" {
|
|||
/**
|
||||
* \brief set the tick-time position of a queue
|
||||
* \param ev event record
|
||||
* \param q queud id to change tempo
|
||||
* \param q queue id to change tempo
|
||||
* \param ttime the new tick-time
|
||||
*/
|
||||
#define snd_seq_ev_set_queue_pos_tick(ev, q, ttime) \
|
||||
|
|
@ -392,7 +392,7 @@ int snd_seq_reset_pool_input(snd_seq_t *seq);
|
|||
(ev)->data.control.value = (val))
|
||||
|
||||
/**
|
||||
* \brief set pitchbend event
|
||||
* \brief set pitch-bend event
|
||||
* \param ev event record
|
||||
* \param ch channel number
|
||||
* \param val pitch bend; zero centered from -8192 to 8191
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ typedef enum _snd_timer_slave_class {
|
|||
/** global timer - RTC */
|
||||
#define SND_TIMER_GLOBAL_RTC 1
|
||||
|
||||
/** timer open mode flag - nonblocking behaviour */
|
||||
/** timer open mode flag - non-blocking behaviour */
|
||||
#define SND_TIMER_OPEN_NONBLOCK 0x0001
|
||||
|
||||
/** timer handle type */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue