Changeset 366 in vbox for trunk

Timestamp:

Jan 26, 2007 4:57:01 PM (18 years ago)

Author:

vboxsync

Message:

made mixing of pcm_in work

Location:

trunk/src/VBox/Devices/Audio

Files:

• audio.c (modified) (4 diffs)
• audio_int.h (modified) (1 diff)
• dsoundaudio.c (modified) (2 diffs)
• ossaudio.c (modified) (1 diff)

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

@@ -128 +128 @@
     1.0
 #else
+#ifndef VBOX
     UINT_MAX,
     UINT_MAX
+#else
+    INT_MAX,
+    INT_MAX
+#endif
 #endif
 };
@@ -137 +142 @@
 {
     0,
-    UINT_MAX,
-    UINT_MAX
+    INT_MAX,
+    INT_MAX
+};
+volume_t pcm_in_volume =
+{
+    0,
+    INT_MAX,
+    INT_MAX
 };
 #endif
@@ -1733 +1744 @@
         case AUD_MIXER_VOLUME:
             name = "MASTER";
-            vol = &pcm_out_volume;
+            vol  = &pcm_out_volume;
             break;
         case AUD_MIXER_PCM:
@@ -1740 +1751 @@
         case AUD_MIXER_LINE_IN:
             name = "LINE_IN";
+            vol  = &pcm_in_volume;
             break;
         default:

trunk/src/VBox/Devices/Audio/audio_int.h

@@ -216 +216 @@
 extern struct audio_driver dsound_audio_driver;
 extern volume_t nominal_volume;
+#ifdef VBOX
+extern volume_t pcm_out_volume;
+extern volume_t pcm_in_volume;
+#endif
 
 uint64_t audio_get_clock (void);

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

@@ -926 +926 @@
     decr = len1 + len2;
 
+#ifndef VBOX
     if (p1 && len1) {
         hw->conv (hw->conv_buf + hw->wpos, p1, len1, &nominal_volume);
@@ -933 +934 @@
         hw->conv (hw->conv_buf, p2, len2, &nominal_volume);
     }
+#else
+    if (p1 && len1) {
+        hw->conv (hw->conv_buf + hw->wpos, p1, len1, &pcm_in_volume);
+    }
+
+    if (p2 && len2) {
+        hw->conv (hw->conv_buf, p2, len2, &pcm_in_volume);
+    }
+#endif
 
     dsound_unlock_in (dscb, p1, p2, blen1, blen2);

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

@@ -783 +783 @@
                 }
                 read_samples += nread >> hwshift;
+#ifndef VBOX
                 hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift,
                           &nominal_volume);
+#else
+                hw->conv (hw->conv_buf + bufs[i].add, p, nread >> hwshift,
+                          &pcm_in_volume);
+#endif
             }