Changeset 53567 in vbox for trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

Timestamp:

Dec 18, 2014 12:42:45 PM (10 years ago)

Author:

vboxsync

Message:

PDM/Audio: Update.

File:

• trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (modified) (22 diffs)

trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp

@@ -213 +213 @@
     if (close(*phFile))
     {
-        LogRel(("Audio: Closing descriptor failed: %s\n", 
+        LogRel(("OSS: Closing descriptor failed: %s\n", 
                 strerror(errno)));
         rc = VERR_GENERAL_FAILURE; /** @todo */
@@ -242 +242 @@
         if (!pszDev)
         {
-            LogRel(("Audio: Invalid or no %s device name set\n", 
+            LogRel(("OSS: Invalid or no %s device name set\n", 
                     fIn ? "input" : "output"));
             rc = VERR_INVALID_PARAMETER;
@@ -251 +251 @@
         if (hFile == -1) 
         {
-            LogRel(("Audio: Failed to open %s: %s\n", pszDev, strerror(errno)));
+            LogRel(("OSS: Failed to open %s: %s\n", pszDev, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -259 +259 @@
         if (ioctl(hFile, SNDCTL_DSP_SAMPLESIZE, &iFormat)) 
         {
-            LogRel(("Audio: Failed to set audio format to %ld\n",
+            LogRel(("OSS: Failed to set audio format to %ld\n",
                     iFormat, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
@@ -268 +268 @@
         if (ioctl(hFile, SNDCTL_DSP_CHANNELS, &cChannels)) 
         {
-            LogRel(("Audio: Failed to set number of audio channels (%d): %s\n",
+            LogRel(("OSS: Failed to set number of audio channels (%d): %s\n",
                      pReq->cChannels, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
@@ -277 +277 @@
         if (ioctl(hFile, SNDCTL_DSP_SPEED, &freq)) 
         {
-            LogRel(("Audio: Failed to set audio frequency (%dHZ): %s\n", 
+            LogRel(("OSS: Failed to set audio frequency (%dHZ): %s\n", 
                     pReq->uFreq, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
@@ -287 +287 @@
         if (ioctl(hFile, SNDCTL_DSP_NONBLOCK)) 
         {
-            LogRel(("Audio: Failed to set non-blocking mode: %s\n",
+            LogRel(("OSS: Failed to set non-blocking mode: %s\n",
                     strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
@@ -296 +296 @@
         if (ioctl(hFile, SNDCTL_DSP_SETFRAGMENT, &mmmmssss)) 
         {
-            LogRel(("Audio: Failed to set %RU16 fragments to %RU32 bytes each: %s\n",
+            LogRel(("OSS: Failed to set %RU16 fragments to %RU32 bytes each: %s\n",
                     pReq->cFragments, pReq->cbFragmentSize, strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
@@ -306 +306 @@
                   &abinfo)) 
         {
-            LogRel(("Audio: Failed to retrieve buffer length: %s\n", strerror(errno)));
+            LogRel(("OSS: Failed to retrieve buffer length: %s\n", strerror(errno)));
             rc = RTErrConvertFromErrno(errno);
             break;
@@ -370 +370 @@
             if (ioctl(pThisStrmOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
             {
-                LogRel(("Audio: Failed to enable output stream: %s\n", 
+                LogRel(("OSS: Failed to enable output stream: %s\n", 
                         strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -383 +383 @@
             if (ioctl(pThisStrmOut->hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
             {
-                LogRel(("Audio: Failed to disable output stream: %s\n", 
+                LogRel(("OSS: Failed to disable output stream: %s\n", 
                        strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -588 +588 @@
         {
             if (obtStream.cFragments * obtStream.cbFragmentSize & pHstStrmIn->Props.uAlign) 
-                LogRel(("Audio: Warning: Misaligned DAC output buffer: Size = %zu, Alignment = %u\n",
+                LogRel(("OSS: Warning: Misaligned DAC output buffer: Size = %zu, Alignment = %u\n",
                         obtStream.cFragments * obtStream.cbFragmentSize, 
                         pHstStrmIn->Props.uAlign + 1));
@@ -616 +616 @@
             if (!pThisStrmIn->pvBuf) 
             {
-                LogRel(("Audio: Failed allocating ADC buffer with %RU32 samples, each %d bytes\n",
+                LogRel(("OSS: Failed allocating ADC buffer with %RU32 samples, each %d bytes\n",
                         cSamples, 1 << pHstStrmIn->Props.cShift));
                 rc = VERR_NO_MEMORY;
@@ -665 +665 @@
         {
             if (obtStream.cFragments * obtStream.cbFragmentSize & pHstStrmOut->Props.uAlign) 
-                LogRel(("Audio: Warning: Misaligned DAC output buffer: Size = %zu, Alignment = %u\n",
+                LogRel(("OSS: Warning: Misaligned DAC output buffer: Size = %zu, Alignment = %u\n",
                         obtStream.cFragments * obtStream.cbFragmentSize, 
                         pHstStrmOut->Props.uAlign + 1));
@@ -693 +693 @@
                 if (pThisStrmOut->pvPCMBuf == MAP_FAILED) 
                 {
-                    LogRel(("Audio: Failed to memory map %zu bytes of DAC output file: %s\n", 
+                    LogRel(("OSS: Failed to memory map %zu bytes of DAC output file: %s\n", 
                             cSamples << pHstStrmOut->Props.cShift, strerror(errno)));
                     rc = RTErrConvertFromErrno(errno);
@@ -703 +703 @@
                     if (ioctl(hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
                     {
-                        LogRel(("Audio: Failed to retrieve initial trigger mask: %s\n", 
+                        LogRel(("OSS: Failed to retrieve initial trigger mask: %s\n", 
                                 strerror(errno)));
                         rc = RTErrConvertFromErrno(errno);
@@ -713 +713 @@
                         if (ioctl (hFile, SNDCTL_DSP_SETTRIGGER, &mask) < 0) 
                         {
-                            LogRel(("Audio: Failed to retrieve PCM_ENABLE_OUTPUT mask: %s\n", 
-                                strerror(errno)));
+                            LogRel(("OSS: Failed to retrieve PCM_ENABLE_OUTPUT mask: %s\n", 
+                                    strerror(errno)));
                             rc = RTErrConvertFromErrno(errno);
                             /* Note: No break here, need to unmap file first! */
@@ -727 +727 @@
                                          cSamples << pHstStrmOut->Props.cShift);
                         if (rc2)
-                            LogRel(("Audio: Failed to unmap DAC output file: %s\n", 
+                            LogRel(("OSS: Failed to unmap DAC output file: %s\n", 
                                     strerror(errno)));
 
@@ -745 +745 @@
                 if (!pThisStrmOut->pvPCMBuf) 
                 {
-                    LogRel(("Audio: Failed allocating DAC buffer with %RU32 samples, each %d bytes\n",
+                    LogRel(("OSS: Failed allocating DAC buffer with %RU32 samples, each %d bytes\n",
                             cSamples, 1 << pHstStrmOut->Props.cShift));
                     rc = VERR_NO_MEMORY;
@@ -793 +793 @@
             if (!rc2) 
             {
-                LogRel(("Audio: Failed to retrieve current playback pointer: %s\n", 
+                LogRel(("OSS: Failed to retrieve current playback pointer: %s\n", 
                         strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -820 +820 @@
             if (rc2 < 0) 
             {
-                LogRel(("Audio: Failed to retrieve current playback buffer: %s\n", 
+                LogRel(("OSS: Failed to retrieve current playback buffer: %s\n", 
                         strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
@@ -865 +865 @@
             if (cbWritten == -1) 
             {
-                LogRel(("Audio: Failed writing output data %s\n", strerror(errno)));
+                LogRel(("OSS: Failed writing output data %s\n", strerror(errno)));
                 rc = RTErrConvertFromErrno(errno);
                 break;