Changeset 390 for GPL/trunk/lib32/sound.c

Timestamp:

Oct 8, 2008, 7:52:36 PM (17 years ago)

Author:

rjerant

Message:

Port OSS32_WaveGetHwPtr() to Uniaud32 1.1.4 from Uniaud32 2.0

File:

• GPL/trunk/lib32/sound.c (modified) (17 diffs)

GPL/trunk/lib32/sound.c

@@ -206 +206 @@
 int ALSAToOSSDataType(ULONG ALSADataType)
 {
-    switch(ALSADataType) 
+    switch(ALSADataType)
     {
     case SNDRV_PCM_FORMAT_S8:
@@ -341 +341 @@
 
     //query wave in & out caps
-    for(i=0;i<2;i++) 
+    for(i=0;i<2;i++)
     {
         PWAVE_CAPS pWaveCaps = (i == 0) ? &pDevCaps->waveOutCaps : &pDevCaps->waveInCaps;
 
         ret = OSS32_WaveOpen(deviceid, (i == 0) ? OSS32_STREAM_WAVEOUT : OSS32_STREAM_WAVEIN, &streamid, 0, 0);
-        if(ret != OSSERR_SUCCESS) 
+        if(ret != OSSERR_SUCCESS)
         {
             printk("OSS32_QueryDevCaps: wave open error %i\n", ret);
@@ -360 +360 @@
         //set operation to non-blocking
         pHandle->file.f_flags = O_NONBLOCK;
-    
+
         ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_INFO, (ULONG)pcminfo);
         if(ret != 0) {
@@ -375 +375 @@
         printk("Device name: %s\n", pDevCaps->szDeviceName);
         pWaveCaps->nrStreams = pcminfo->subdevices_count;
-    
+
         //get all hardware parameters
         _snd_pcm_hw_params_any(params);
@@ -415 +415 @@
         mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
         format_mask = mask->bits[0];
-        for(fmt=0;fmt<32;fmt++) 
+        for(fmt=0;fmt<32;fmt++)
         {
-            if(format_mask & (1 << fmt)) 
+            if(format_mask & (1 << fmt))
             {
                 int f = ALSAToOSSDataType(fmt);
@@ -430 +430 @@
     }
     //Check support for MPU401, FM & Wavetable MIDI
-    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_MPU401_MIDIOUT, &streamid) == OSSERR_SUCCESS) 
+    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_MPU401_MIDIOUT, &streamid) == OSSERR_SUCCESS)
     {
         pDevCaps->ulCaps |= OSS32_CAPS_MPU401_PLAYBACK;
@@ -436 +436 @@
         streamid = 0;
     }
-    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_MPU401_MIDIIN, &streamid) == OSSERR_SUCCESS) 
+    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_MPU401_MIDIIN, &streamid) == OSSERR_SUCCESS)
     {
         pDevCaps->ulCaps |= OSS32_CAPS_MPU401_CAPTURE;
@@ -442 +442 @@
         streamid = 0;
     }
-    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_FM_MIDIOUT, &streamid) == OSSERR_SUCCESS) 
+    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_FM_MIDIOUT, &streamid) == OSSERR_SUCCESS)
     {
         pDevCaps->ulCaps |= OSS32_CAPS_FMSYNTH_PLAYBACK;
@@ -448 +448 @@
         streamid = 0;
     }
-    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_WAVETABLE_MIDIOUT, &streamid) == OSSERR_SUCCESS) 
+    if(OSS32_MidiOpen(deviceid, OSS32_STREAM_WAVETABLE_MIDIOUT, &streamid) == OSSERR_SUCCESS)
     {
         pDevCaps->ulCaps |= OSS32_CAPS_WAVETABLE_PLAYBACK;
@@ -986 +986 @@
     _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_RATE,
                           pHwParams->ulSampleRate, 0);
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 
+    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
                           periodsize, 0);
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 
+    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
                           periodbytes, 0);
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIODS, 
+    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_PERIODS,
                           nrperiods, 0);
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_SIZE, 
+    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
                           periodsize*nrperiods, 0);
-    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, 
+    _snd_pcm_hw_param_set(&params, SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
                           periodbytes*nrperiods, 0);
 //#ifdef DEBUG_PK
@@ -1032 +1032 @@
 
     //set silence threshold (all sizes in frames) (only needed for playback)
-    if(pHandle->file.f_mode == FMODE_WRITE) 
+    if(pHandle->file.f_mode == FMODE_WRITE)
     {
         swparams.avail_min         = periodsize;
@@ -1119 +1119 @@
 #endif
 
-    if (size == 0) 
+    if (size == 0)
     {
 #ifdef DEBUG_PK
@@ -1139 +1139 @@
         // size should be aligned to channels number * samplesize  //PS+++ what is it and why?!?!?!
         j = 10;            // 10 try if error
-        while (size && j && ret) 
+        while (size && j && ret)
         {
                for (i=0; i < 1000; i++)
@@ -1147 +1147 @@
                      if ((status.state != SNDRV_PCM_STATE_XRUN ) && samples_to_bytes(status.avail) )
                          break;
-                     if (i > 998) 
+                     if (i > 998)
                      {
 //                         printk("timeout stat %x avail:%d hw:%d app:%d\n",status.state,samples_to_bytes(status.avail),samples_to_bytes(status.hw_ptr), samples_to_bytes(status.appl_ptr));
@@ -1162 +1162 @@
                ret = pHandle->file.f_op->write(&pHandle->file, (char *)buffer, size, &pHandle->file.f_pos);
 
-               if (ret < 0 ) 
+               if (ret < 0 )
                {  // We have any error, don't try more
                   j--;
@@ -1168 +1168 @@
                       ret1 = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_PREPARE, 0);
 //                  printk("Error ret:%i ret1:%i trans: %d need %d tot:%d\n",ret,ret1,transferred, size,size1);
-                  continue; 
+                  continue;
                }
                if (ret == 0)  continue;
@@ -1266 +1266 @@
 //******************************************************************************
 //******************************************************************************
+OSSRET OSS32_WaveGetHwPtr(ULONG streamid, ULONG *pPosition)
+{
+    soundhandle        *pHandle = (soundhandle *)streamid;
+    struct snd_pcm_status    status;
+    int                 ret;
+    ULONG               delta;
+
+    if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
+        DebugInt3();
+        return OSSERR_INVALID_STREAMID;
+    }
+    if(pPosition == NULL) {
+        DebugInt3();
+        return OSSERR_INVALID_PARAMETER;
+    }
+
+    //set operation to non-blocking
+    pHandle->file.f_flags = O_NONBLOCK;
+
+    //Get the status of the stream
+    ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_PCM_IOCTL_STATUS, (ULONG)__Stack32ToFlat(&status));
+
+    if(ret) {
+        DebugInt3();
+        return UNIXToOSSError(ret);
+    }
+
+    dprintf(("OSS32_WaveGetHwPtr: %lx", samples_to_bytes(status.appl_ptr)));
+    *pPosition = samples_to_bytes(status.appl_ptr);  //return new hardware position
+    return OSSERR_SUCCESS;
+}
+
+//******************************************************************************
+//******************************************************************************
 OSSRET OSS32_WaveSetVolume(OSSSTREAMID streamid, ULONG volume)
 {