Changeset 6140 in vbox for trunk/src/VBox

Timestamp:

Dec 18, 2007 5:20:07 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

26872

Message:

Pass the VM name to the audio driver. PulseAudio will name the name of the stream according to that name.

Location:

trunk/src/VBox

Files:

• Devices/Audio/audio.c (modified) (3 diffs)
• Devices/Audio/audio.h (modified) (1 diff)
• Devices/Audio/pulseaudio.c (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (1 diff)

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

@@ -87 +87 @@
 };
 
+static char *audio_streamname;
+
+const char *audio_get_stream_name(void)
+{
+    return audio_streamname;
+}
+
 struct fixed_settings {
     int enabled;
@@ -1912 +1919 @@
      * Validate the config.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "AudioDriver\0"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "AudioDriver\0StreamName\0"))
         return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES;
 
@@ -1929 +1936 @@
     if (VBOX_FAILURE (rc))
         return rc;
+
+    rc = CFGMR3QueryStringAlloc (pCfgHandle, "StreamName", &audio_streamname);
+    if (VBOX_FAILURE (rc))
+        audio_streamname = NULL;
 
     rc = AUD_init (pDrvIns, drvname);

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

@@ -196 +196 @@
 #endif
 
+#ifdef VBOX
+const char *audio_get_stream_name(void);
+#endif
+
 #endif  /* audio.h */

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

@@ -180 +180 @@
     const pa_buffer_attr *pBufAttr;
     const pa_sample_spec *pSampSpec;
-    const char           *pchPCMName = fIn ? "pcm_in" : "pcm_out";
+    char                  achPCMName[64];
     pa_stream_flags_t     flags;
     int                   ms = fIn ? conf.buffer_msecs_in : conf.buffer_msecs_out;
-
+    const char           *stream_name = audio_get_stream_name();
+
+    RTStrPrintf(achPCMName, sizeof(achPCMName), "%.32s%s%s%s",
+                stream_name ? stream_name : "",
+                stream_name ? " (" : "",
+                fIn ? "pcm_in" : "pcm_out",
+                stream_name ? ")" : "");
     sspec.rate     = req->freq;
     sspec.channels = req->nchannels;
@@ -206 +212 @@
     pa_threaded_mainloop_lock(g_pMainLoop);
 
-    if (!(pStream = pa_stream_new(g_pContext, pchPCMName, &sspec, &cmap)))
-    {
-        LogRel(("Pulse: Cannot create stream %s\n", pchPCMName));
+    if (!(pStream = pa_stream_new(g_pContext, achPCMName, &sspec, &cmap)))
+    {
+        LogRel(("Pulse: Cannot create stream %s\n", achPCMName));
         goto unlock_and_fail;
     }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1345 +1345 @@
 #endif
         }
+        hrc = pMachine->COMGETTER(Name)(&str);                                          H();
+        STR_CONV();
+        rc = CFGMR3InsertString(pCfg,  "StreamName", psz);                              RC_CHECK();
+        STR_FREE();
     }