Changeset 1071 in vbox for trunk/src/VBox/Devices/Audio/ossaudio.c

Timestamp:

Feb 27, 2007 11:00:14 AM (18 years ago)

Author:

vboxsync

Message:

fix Vista crash if sound is enabled; made audio LogRel consistent; winmm was never used, show dsound instead

File:

• trunk/src/VBox/Devices/Audio/ossaudio.c (modified) (15 diffs)

trunk/src/VBox/Devices/Audio/ossaudio.c

@@ -227 +227 @@
         oss_logerr2 (errno, typ, "Failed to open `%s'\n", dspname);
 #else
-        LogRel(("Audio/OSS: Failed to open %s for %s (%s)\n",
+        LogRel(("OSS: Failed to open %s for %s (%s)\n",
                  dspname, typ, strerror(errno)));
 #endif
@@ -234 +234 @@
 
 #ifdef VBOX
-    LogRel(("Audio/OSS: Successfully opened %s for %s\n", dspname, typ));
+    LogRel(("OSS: Successfully opened %s for %s\n", dspname, typ));
 #endif
 
@@ -245 +245 @@
         oss_logerr2 (errno, typ, "Failed to set sample size %d\n", req->fmt);
 #else
-        LogRel(("Audio/OSS: Failed to set sample size %d (%s)\n",
+        LogRel(("OSS: Failed to set sample size %d (%s)\n",
                  req->fmt, strerror(errno)));
 #endif
@@ -256 +256 @@
                      req->nchannels);
 #else
-        LogRel(("Audio/OSS: Failed to set nchannels=%d (%s)\n",
+        LogRel(("OSS: Failed to set nchannels=%d (%s)\n",
                  req->nchannels, strerror(errno)));
 #endif
@@ -266 +266 @@
         oss_logerr2 (errno, typ, "Failed to set frequency %d\n", req->freq);
 #else
-        LogRel(("Audio/OSS: Failed to set freq=%dHZ\n", req->freq, strerror(errno)));
+        LogRel(("OSS: Failed to set freq=%dHZ\n", req->freq, strerror(errno)));
 #endif
         goto err;
@@ -275 +275 @@
         oss_logerr2 (errno, typ, "Failed to set non-blocking mode\n");
 #else
-        LogRel(("Audio/OSS: Failed to set non-blocking mode (%s)\n", strerror(errno)));
+        LogRel(("OSS: Failed to set non-blocking mode (%s)\n", strerror(errno)));
 #endif
         goto err;
@@ -286 +286 @@
                      req->nfrags, req->fragsize);
 #else
-        LogRel(("Audio/OSS: Failed to set buffer_length=%d,%d (%s)\n",
+        LogRel(("OSS: Failed to set buffer_length=%d,%d (%s)\n",
                 req->nfrags, req->fragsize, strerror(errno)));
 #endif
@@ -296 +296 @@
         oss_logerr2 (errno, typ, "Failed to get buffer length\n");
 #else
-        LogRel(("Audio/OSS: Failed to get buffer length (%s)\n", strerror(errno)));
+        LogRel(("OSS: Failed to get buffer length (%s)\n", strerror(errno)));
 #endif
         goto err;
@@ -327 +327 @@
     oss_anal_close (&fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for %s\n",
+    LogRel(("OSS: Closed %s for %s\n",
             in ? conf.devpath_in : conf.devpath_out, in ? "ADC" : "DAC"));
 #endif
@@ -482 +482 @@
     oss_anal_close (&oss->fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for DAC\n", conf.devpath_out));
+    LogRel(("OSS: Closed %s for DAC\n", conf.devpath_out));
 #endif
 
@@ -530 +530 @@
         oss_anal_close (&fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for DAC\n", conf.devpath_out));
+    LogRel(("OSS: Closed %s for DAC\n", conf.devpath_out));
 #endif
         return -1;
@@ -611 +611 @@
             oss_anal_close (&fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for DAC\n", conf.devpath_out));
+    LogRel(("OSS: Closed %s for DAC\n", conf.devpath_out));
 #endif
             return -1;
@@ -687 +687 @@
         oss_anal_close (&fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for ADC\n", conf.devpath_in));
+    LogRel(("OSS: Closed %s for ADC\n", conf.devpath_in));
 #endif
         return -1;
@@ -713 +713 @@
         oss_anal_close (&fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for ADC\n", conf.devpath_in));
+    LogRel(("OSS: Closed %s for ADC\n", conf.devpath_in));
 #endif
         return -1;
@@ -728 +728 @@
     oss_anal_close (&oss->fd);
 #ifdef VBOX
-    LogRel(("Audio/OSS: Closed %s for ADC\n", conf.devpath_in));
+    LogRel(("OSS: Closed %s for ADC\n", conf.devpath_in));
 #endif