summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAbramo Bagnara <abramo@alsa-project.org>2000-12-23 16:13:38 +0000
committerAbramo Bagnara <abramo@alsa-project.org>2000-12-23 16:13:38 +0000
commitc1ad05163661cbf315cd3ebb5d40ba24322a4eac (patch)
tree93b53ca1823e33ed6370a7d410b1bb60f60de355 /include
parent80c3adaacec91eef3f93b21c95ad1cc5914a5320 (diff)
Fixed snd_*_card() wrt aserver
Diffstat (limited to 'include')
-rw-r--r--include/aserver.h1
-rw-r--r--include/pcm.h12
2 files changed, 6 insertions, 7 deletions
diff --git a/include/aserver.h b/include/aserver.h
index 9b4cc834..079dbb40 100644
--- a/include/aserver.h
+++ b/include/aserver.h
@@ -38,7 +38,6 @@ typedef struct {
size_t hw_ptr;
size_t appl_ptr;
union {
- int card;
struct {
int sig;
pid_t pid;
diff --git a/include/pcm.h b/include/pcm.h
index 8efc8708..03ee123c 100644
--- a/include/pcm.h
+++ b/include/pcm.h
@@ -106,21 +106,21 @@ int mask_single(const mask_t *mask);
int snd_pcm_hw_params_any(snd_pcm_t *pcm, snd_pcm_hw_params_t *params);
int snd_pcm_hw_params_near(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
- unsigned int par, unsigned int val);
+ unsigned int var, unsigned int val);
int snd_pcm_hw_params_min(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
- unsigned int par, unsigned int val);
+ unsigned int var, unsigned int val);
int snd_pcm_hw_params_max(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
- unsigned int par, unsigned int val);
+ unsigned int var, unsigned int val);
int snd_pcm_hw_params_minmax(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
- unsigned int par, unsigned int min, unsigned int max);
+ unsigned int var, unsigned int min, unsigned int max);
int snd_pcm_hw_params_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int par);
int snd_pcm_hw_params_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
unsigned int par);
int snd_pcm_hw_params_set(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
- unsigned int par, unsigned int val);
+ unsigned int var, unsigned int val);
int snd_pcm_hw_params_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params,
- unsigned int par, const mask_t *mask);
+ unsigned int var, const mask_t *mask);
int snd_pcm_hw_params_info_rate(const snd_pcm_hw_params_t *params,
unsigned int *rate_num,
unsigned int *rate_den);