[alsa-cvslog] CVS: alsa-lib/src/pcm pcm.c,1.284,1.285

[Jaroslav Kysela]

Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29021/src/pcm

Modified Files:
        pcm.c 
Log Message:
Fixed bugs detected by Intel compiler

Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm.c,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- pcm.c       15 Apr 2004 12:52:51 -0000      1.284
+++ pcm.c       20 Apr 2004 13:42:49 -0000      1.285
@@ -743,20 +743,20 @@
        if (!pcm->setup)
                return -EBADFD;
        memset(params, 0, snd_pcm_hw_params_sizeof());
-       snd_mask_copy(&params->masks[SND_PCM_HW_PARAM_ACCESS], (snd_mask_t 
*)&pcm->access);
-       snd_mask_copy(&params->masks[SND_PCM_HW_PARAM_FORMAT], (snd_mask_t 
*)&pcm->format);
-       snd_mask_copy(&params->masks[SND_PCM_HW_PARAM_SUBFORMAT], (snd_mask_t 
*)&pcm->subformat);
+       snd_mask_copy(&params->masks[SND_PCM_HW_PARAM_ACCESS - 
SNDRV_PCM_HW_PARAM_FIRST_MASK], (snd_mask_t *)&pcm->access);
+       snd_mask_copy(&params->masks[SND_PCM_HW_PARAM_FORMAT - 
SNDRV_PCM_HW_PARAM_FIRST_MASK], (snd_mask_t *)&pcm->format);
+       snd_mask_copy(&params->masks[SND_PCM_HW_PARAM_SUBFORMAT - 
SNDRV_PCM_HW_PARAM_FIRST_MASK], (snd_mask_t *)&pcm->subformat);
        frame_bits = snd_pcm_format_physical_width(pcm->format) * pcm->channels;
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_FRAME_BITS], 
frame_bits);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_CHANNELS], 
pcm->channels);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_RATE], pcm->rate);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_PERIOD_TIME], 
pcm->period_time);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_PERIOD_SIZE], 
pcm->period_size);
-       snd_interval_copy(&params->intervals[SND_PCM_HW_PARAM_PERIODS], &pcm->periods);
-       snd_interval_copy(&params->intervals[SND_PCM_HW_PARAM_BUFFER_TIME], 
&pcm->buffer_time);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_BUFFER_SIZE], 
pcm->buffer_size);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_BUFFER_BYTES], 
(pcm->buffer_size * frame_bits) / 8);
-       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_TICK_TIME], 
pcm->tick_time);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_FRAME_BITS - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], frame_bits);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_CHANNELS - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], pcm->channels);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_RATE - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], pcm->rate);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_PERIOD_TIME - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], pcm->period_time);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_PERIOD_SIZE - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], pcm->period_size);
+       snd_interval_copy(&params->intervals[SND_PCM_HW_PARAM_PERIODS - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], &pcm->periods);
+       snd_interval_copy(&params->intervals[SND_PCM_HW_PARAM_BUFFER_TIME - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], &pcm->buffer_time);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_BUFFER_SIZE - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], pcm->buffer_size);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_BUFFER_BYTES - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], (pcm->buffer_size * frame_bits) / 8);
+       snd_interval_set_value(&params->intervals[SND_PCM_HW_PARAM_TICK_TIME - 
SNDRV_PCM_HW_PARAM_FIRST_INTERVAL], pcm->tick_time);
        params->info = pcm->info;
        params->msbits = pcm->msbits;
        params->rate_num = pcm->rate_num;
@@ -1814,7 +1814,7 @@
  */
 snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler)
 {
-       assert(handler->type = SND_ASYNC_HANDLER_PCM);
+       assert(handler->type == SND_ASYNC_HANDLER_PCM);
        return handler->u.pcm;
 }
 



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog