Changeset 363

Timestamp:

07/26/08 03:06:39 (4 months ago)

Author:

psmedley

Message:

Add missing file

Location:

GPL/branches/uniaud32-2.0

Files:

• alsa-kernel/core/vmaster.c (added)
• lib32/sound.c (modified) (5 diffs)

GPL/branches/uniaud32-2.0/lib32/sound.c

@@ -402 +402 @@
         pWaveCaps->ulMaxRate     = hw_param_interval(params, SNDRV_PCM_HW_PARAM_RATE)->max;
 
-        mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
-        printk("rate flags1: %X", mask);
-
         mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_RATE_MASK);
-        printk("rate flags2: %X", mask);
 
         pWaveCaps->ulRateFlags   = mask->bits[0];
-
-        printk("rate flags3: %X", pWaveCaps->ulRateFlags);
+ 
         pWaveCaps->ulRateFlags   = ALSAToOSSRateFlags(pWaveCaps->ulRateFlags);
-
-        printk("rate flags4: %X", pWaveCaps->ulRateFlags);
 
         pWaveCaps->ulDataFormats = 0;
@@ -433 +426 @@
 
     }
+
     //Check support for MPU401, FM & Wavetable MIDI
     if(OSS32_MidiOpen(deviceid, OSS32_STREAM_MPU401_MIDIOUT, &streamid) == OSSERR_SUCCESS) 
@@ -458 +452 @@
         streamid = 0;
     }
+
     if(OSS32_MixQueryName(deviceid, &pDevCaps->szMixerName, sizeof(pDevCaps->szMixerName)) != OSSERR_SUCCESS) {
         DebugInt3();
@@ -881 +876 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_ACCESS,
                           SNDRV_PCM_ACCESS_RW_INTERLEAVED, 0);
+#if 0 
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
                           pHwParams->ulBitsPerSample, 0);
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_FRAME_BITS,
                           pHwParams->ulBitsPerSample*pHwParams->ulNumChannels, 0);
+#endif
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_FORMAT,
                           OSSToALSADataType[pHwParams->ulDataType], 0);
+
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_CHANNELS,
                            pHwParams->ulNumChannels, 0);
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
                           pHwParams->ulSampleRate, 0);
+#if 0
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
                           periodsize, 0);
@@ -901 +900 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 
                           periodbytes*nrperiods, 0);
-
+#endif
     dprintf(("Hardware parameters: sample rate %d, data type %d, channels %d, period size %d, periods %d", 
              pHwParams->ulSampleRate, pHwParams->ulDataType, pHwParams->ulNumChannels, periodsize, nrperiods));