mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed more asserts

Browse source
This commit is contained in:
Jaroslav Kysela 2003-05-28 18:49:15 +00:00
parent 4bd0183b1f
commit 3b9b0d37bf
3 changed files with 27 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/pcm/interval.c
View file

@ -105,7 +105,8 @@ static inline unsigned int muldiv32(unsigned int a, unsigned int b,
int snd_interval_refine_min(snd_interval_t *i, unsigned int min, int openmin)
{
int changed = 0;
assert(!snd_interval_empty(i));
if (snd_interval_empty(i))
return -ENOENT;
if (i->min < min) {
i->min = min;
i->openmin = openmin;
@ -130,7 +131,8 @@ int snd_interval_refine_min(snd_interval_t *i, unsigned int min, int openmin)
int snd_interval_refine_max(snd_interval_t *i, unsigned int max, int openmax)
{
int changed = 0;
assert(!snd_interval_empty(i));
if (snd_interval_empty(i))
return -ENOENT;
if (i->max > max) {
i->max = max;
i->openmax = openmax;
@ -156,7 +158,8 @@ int snd_interval_refine_max(snd_interval_t *i, unsigned int max, int openmax)
int snd_interval_refine(snd_interval_t *i, const snd_interval_t *v)
{
int changed = 0;
assert(!snd_interval_empty(i));
if (snd_interval_empty(i))
return -ENOENT;
if (i->min < v->min) {
i->min = v->min;
i->openmin = v->openmin;
@ -197,7 +200,8 @@ int snd_interval_refine(snd_interval_t *i, const snd_interval_t *v)
int snd_interval_refine_first(snd_interval_t *i)
{
assert(!snd_interval_empty(i));
if (snd_interval_empty(i))
return -ENOENT;
if (snd_interval_single(i))
return 0;
i->max = i->min;
@ -209,7 +213,8 @@ int snd_interval_refine_first(snd_interval_t *i)
int snd_interval_refine_last(snd_interval_t *i)
{
assert(!snd_interval_empty(i));
if (snd_interval_empty(i))
return -ENOENT;
if (snd_interval_single(i))
return 0;
i->min = i->max;

18
src/pcm/mask_inline.h
View file

@ -212,7 +212,8 @@ MASK_INLINE int snd_mask_single(const snd_mask_t *mask)
MASK_INLINE int snd_mask_refine(snd_mask_t *mask, const snd_mask_t *v)
{
snd_mask_t old;
assert(!snd_mask_empty(mask));
if (snd_mask_empty(mask))
return -ENOENT;
snd_mask_copy(&old, mask);
snd_mask_intersect(mask, v);
if (snd_mask_empty(mask))
@ -222,7 +223,8 @@ MASK_INLINE int snd_mask_refine(snd_mask_t *mask, const snd_mask_t *v)
MASK_INLINE int snd_mask_refine_first(snd_mask_t *mask)
{
assert(!snd_mask_empty(mask));
if (snd_mask_empty(mask))
return -ENOENT;
if (snd_mask_single(mask))
return 0;
snd_mask_leave(mask, snd_mask_min(mask));
@ -231,7 +233,8 @@ MASK_INLINE int snd_mask_refine_first(snd_mask_t *mask)
MASK_INLINE int snd_mask_refine_last(snd_mask_t *mask)
{
assert(!snd_mask_empty(mask));
if (snd_mask_empty(mask))
return -ENOENT;
if (snd_mask_single(mask))
return 0;
snd_mask_leave(mask, snd_mask_max(mask));
@ -240,7 +243,8 @@ MASK_INLINE int snd_mask_refine_last(snd_mask_t *mask)
MASK_INLINE int snd_mask_refine_min(snd_mask_t *mask, unsigned int val)
{
assert(!snd_mask_empty(mask));
if (snd_mask_empty(mask))
return -ENOENT;
if (snd_mask_min(mask) >= val)
return 0;
snd_mask_reset_range(mask, 0, val - 1);
@ -251,7 +255,8 @@ MASK_INLINE int snd_mask_refine_min(snd_mask_t *mask, unsigned int val)
MASK_INLINE int snd_mask_refine_max(snd_mask_t *mask, unsigned int val)
{
assert(!snd_mask_empty(mask));
if (snd_mask_empty(mask))
return -ENOENT;
if (snd_mask_max(mask) <= val)
return 0;
snd_mask_reset_range(mask, val + 1, SND_MASK_MAX);
@ -263,7 +268,8 @@ MASK_INLINE int snd_mask_refine_max(snd_mask_t *mask, unsigned int val)
MASK_INLINE int snd_mask_refine_set(snd_mask_t *mask, unsigned int val)
{
int changed;
assert(!snd_mask_empty(mask));
if (snd_mask_empty(mask))
return -ENOENT;
changed = !snd_mask_single(mask);
snd_mask_leave(mask, val);
if (snd_mask_empty(mask))

8
src/pcm/pcm_params.c
View file

@ -296,7 +296,7 @@ static int _snd_pcm_hw_param_set_first(snd_pcm_hw_params_t *params,
assert(0);
return -EINVAL;
}
if (changed) {
if (changed > 0) {
params->cmask |= 1 << var;
params->rmask |= 1 << var;
}
@ -338,7 +338,7 @@ static int _snd_pcm_hw_param_set_last(snd_pcm_hw_params_t *params,
assert(0);
return -EINVAL;
}
if (changed) {
if (changed > 0) {
params->cmask |= 1 << var;
params->rmask |= 1 << var;
}
@ -1936,7 +1936,9 @@ static snd_interval_t refine_intervals[SND_PCM_HW_PARAM_LAST_INTERVAL - SND_PCM_
},
};
#undef RULES_DEBUG
#if 0
#define RULES_DEBUG
#endif
int snd_pcm_hw_refine_soft(snd_pcm_t *pcm ATTRIBUTE_UNUSED, snd_pcm_hw_params_t *params)
{