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

Timestamp:

Apr 3, 2017, 4:51:56 PM (8 years ago)

Author:

David Azarewicz

Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• lib32/sound.c (modified) (4 diffs)

GPL/trunk/lib32/sound.c

@@ -329 +329 @@
         ULONG                            format_mask;
         struct snd_mask                   *mask;
-        int max_ch;
+        //int max_ch;
 
         dprintf(("OSS32_QueryDevCaps"));
@@ -773 +773 @@
         ULONG                           periodbytes, minperiodbytes, maxperiodbytes;
         BOOL                            fTryAgain = FALSE;
-        ULONG ulMinRate, ulMaxRate;
+        //ULONG ulMinRate, ulMaxRate;
 
         if(pHandle == NULL || pHandle->magic != MAGIC_WAVE_ALSA32) {
@@ -1063 +1063 @@
         soundhandle        *pHandle = (soundhandle *)streamid;
         struct snd_pcm_status    status;
-        int                             iRet, align, iRet1;
+        int                             iRet;
+        //int align, iRet1;
         LONG                            ulTransferred;
-        ULONG                           ulPosition, ulI, ulJ, ulSize;
-        char                            *buf;
+        //ULONG                         ulPosition, ulI, ulJ;
+        ULONG ulSize;
+        //char                          *buf;
 
 //        return OSSERR_SUCCESS;
@@ -1109 +1111 @@
                         return OSSERR_BUFFER_FULL;
                 }
+                
+                //dprintf(("WaveAddBuffer: ReqSize=%x Size=%x", ulReqSize, ulSize));
 
                 //rprintf(("AddBuffer: state=%x avail=%x ReqSize=%x", status.state, status.avail, ulReqSize));