mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2025-10-29 05:40:25 -04:00
Corrected and completed encapsulation for PCM and rawmidi. Remove SND_PCM_HW_PARAM_* and use functions. Separated rawmidi info between streams
This commit is contained in:
parent
544718f10d
commit
a7561a9c7e
40 changed files with 2733 additions and 1537 deletions
|
|
@ -5,22 +5,24 @@
|
|||
* *
|
||||
****************************************************************************/
|
||||
|
||||
typedef struct _snd_rawmidi_info snd_rawmidi_info_t;
|
||||
typedef struct _snd_rawmidi_params snd_rawmidi_params_t;
|
||||
typedef struct _snd_rawmidi_status snd_rawmidi_status_t;
|
||||
|
||||
/* sndrv aliasing */
|
||||
#ifdef SND_ENUM_TYPECHECK
|
||||
typedef struct _snd_rawmidi_stream *snd_rawmidi_stream_t;
|
||||
#else
|
||||
typedef enum sndrv_rawmidi_stream snd_rawmidi_stream_t;
|
||||
typedef struct sndrv_rawmidi_info snd_rawmidi_info_t;
|
||||
typedef struct sndrv_rawmidi_params snd_rawmidi_params_t;
|
||||
typedef struct sndrv_rawmidi_status snd_rawmidi_status_t;
|
||||
#define SND_RAWMIDI_STREAM_OUTPUT SNDRV_RAWMIDI_STREAM_OUTPUT
|
||||
#define SND_RAWMIDI_STREAM_INPUT SNDRV_RAWMIDI_STREAM_INPUT
|
||||
#endif
|
||||
|
||||
#define SND_RAWMIDI_STREAM_OUTPUT ((snd_rawmidi_stream_t) SNDRV_RAWMIDI_STREAM_OUTPUT)
|
||||
#define SND_RAWMIDI_STREAM_INPUT ((snd_rawmidi_stream_t) SNDRV_RAWMIDI_STREAM_INPUT)
|
||||
#define SND_RAWMIDI_INFO_OUTPUT SNDRV_RAWMIDI_INFO_OUTPUT
|
||||
#define SND_RAWMIDI_INFO_INPUT SNDRV_RAWMIDI_INFO_INPUT
|
||||
#define SND_RAWMIDI_INFO_DUPLEX SNDRV_RAWMIDI_INFO_DUPLEX
|
||||
#define SND_RAWMIDI_INFO_XXXX SNDRV_RAWMIDI_INFO_XXXX
|
||||
#define SND_RAWMIDI_PARBIT_STREAM SNDRV_RAWMIDI_PARBIT_STREAM
|
||||
#define SND_RAWMIDI_PARBIT_BUFFER_SIZE SNDRV_RAWMIDI_PARBIT_BUFFER_SIZE
|
||||
#define SND_RAWMIDI_PARBIT_AVAIL_MIN SNDRV_RAWMIDI_PARBIT_AVAIL_MIN
|
||||
|
||||
#define SND_RAWMIDI_OPEN_OUTPUT (1<<SND_RAWMIDI_STREAM_OUTPUT)
|
||||
#define SND_RAWMIDI_OPEN_INPUT (1<<SND_RAWMIDI_STREAM_INPUT)
|
||||
#define SND_RAWMIDI_OPEN_OUTPUT (1<<SNDRV_RAWMIDI_STREAM_OUTPUT)
|
||||
#define SND_RAWMIDI_OPEN_INPUT (1<<SNDRV_RAWMIDI_STREAM_INPUT)
|
||||
#define SND_RAWMIDI_OPEN_DUPLEX (SND_RAWMIDI_OPEN_OUTPUT|SND_RAWMIDI_OPEN_INPUT)
|
||||
|
||||
#define SND_RAWMIDI_APPEND 1
|
||||
|
|
@ -40,20 +42,21 @@ extern "C" {
|
|||
|
||||
int snd_rawmidi_open(snd_rawmidi_t **handle, char *name, int streams, int mode);
|
||||
int snd_rawmidi_close(snd_rawmidi_t *handle);
|
||||
int snd_rawmidi_card(snd_rawmidi_t *handle);
|
||||
int snd_rawmidi_poll_descriptor(snd_rawmidi_t *handle);
|
||||
int snd_rawmidi_nonblock(snd_rawmidi_t *handle, int nonblock);
|
||||
int snd_rawmidi_info(snd_rawmidi_t *handle, snd_rawmidi_info_t * info);
|
||||
int snd_rawmidi_params(snd_rawmidi_t *handle, snd_rawmidi_params_t * params);
|
||||
int snd_rawmidi_status(snd_rawmidi_t *handle, snd_rawmidi_status_t * status);
|
||||
int snd_rawmidi_output_drop(snd_rawmidi_t *handle);
|
||||
int snd_rawmidi_output_drain(snd_rawmidi_t *handle);
|
||||
int snd_rawmidi_input_drain(snd_rawmidi_t *handle);
|
||||
int snd_rawmidi_drain(snd_rawmidi_t *handle, int channel);
|
||||
int snd_rawmidi_drop(snd_rawmidi_t *handle, int channel);
|
||||
int snd_rawmidi_poll_descriptor(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream);
|
||||
int snd_rawmidi_nonblock(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream, int nonblock);
|
||||
int snd_rawmidi_info(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream, snd_rawmidi_info_t * info);
|
||||
int snd_rawmidi_params(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream, snd_rawmidi_params_t * params);
|
||||
int snd_rawmidi_status(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream, snd_rawmidi_status_t * status);
|
||||
int snd_rawmidi_drain(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream);
|
||||
int snd_rawmidi_drop(snd_rawmidi_t *handle, snd_rawmidi_stream_t stream);
|
||||
ssize_t snd_rawmidi_write(snd_rawmidi_t *handle, const void *buffer, size_t size);
|
||||
ssize_t snd_rawmidi_read(snd_rawmidi_t *handle, void *buffer, size_t size);
|
||||
|
||||
int snd_rawmidi_params_current(snd_pcm_t *pcm, snd_rawmidi_params_t *params);
|
||||
int snd_rawmidi_params_dump(snd_rawmidi_params_t *params, snd_output_t *out);
|
||||
|
||||
int snd_rawmidi_status_dump(snd_rawmidi_status_t *status, snd_output_t *out);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue