Changeset 59989 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 11, 2016 12:29:36 PM (9 years ago)

Author:

vboxsync

Message:

Build fix, warnings.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DrvAudio.cpp (modified) (1 diff)
• DrvHostALSAAudio.cpp (modified) (1 diff)
• DrvHostCoreAudio.cpp (modified) (1 diff)
• DrvHostOSSAudio.cpp (modified) (1 diff)
• DrvHostPulseAudio.cpp (modified) (4 diffs)

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

@@ -1756 +1756 @@
 
     {"PLIVE", AUD_OPT_BOOL, &conf.plive,
-     "(undocumented)", NULL, 0}, /** @todo What is this? */
-
-    NULL
+     "(undocumented)", NULL, 0} /** @todo What is this? */
 };
 

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

@@ -1487 +1487 @@
 
     {"ADCDev", AUD_OPT_STR, &s_ALSAConf.pcm_name_in,
-     "ADC device name", NULL, 0},
-
-    NULL
+     "ADC device name", NULL, 0}
 };
 

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

@@ -2071 +2071 @@
 
     /** @todo Implement a proper device detection. */
-    pCfg->cDevsIn         = 1;
-    pCfg->cDevsOut        = 1;
+    pCfg->cSource         = 1;
+    pCfg->cSinks          = 1;
 
     return VINF_SUCCESS;

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

@@ -1067 +1067 @@
     PDM_DRVREG_VERSION
 };
+

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

@@ -986 +986 @@
 }
 
-static DECLCALLBACK(void) paEnumSinkCb(pa_context *pCtx, const pa_sink_info *pInfo, int eol, void *pvUserData)
+static void paEnumSinkCb(pa_context *pCtx, const pa_sink_info *pInfo, int eol, void *pvUserData)
 {
     if (eol != 0)
@@ -1006 +1006 @@
 }
 
-static DECLCALLBACK(void) paEnumSourceCb(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
+static void paEnumSourceCb(pa_context *pCtx, const pa_source_info *pInfo, int eol, void *pvUserData)
 {
     if (eol != 0)
@@ -1026 +1026 @@
 }
 
-static DECLCALLBACK(void) paEnumServerCb(pa_context *pCtx, const pa_server_info *pInfo, void *pvUserData)
+static void paEnumServerCb(pa_context *pCtx, const pa_server_info *pInfo, void *pvUserData)
 {
     AssertPtrReturnVoid(pCtx);
@@ -1457 +1457 @@
      "DAC period size in milliseconds", NULL, 0},
     {"ADC_MS", AUD_OPT_INT, &s_pulseCfg.buffer_msecs_in,
-     "ADC period size in milliseconds", NULL, 0},
-
-    NULL
+     "ADC period size in milliseconds", NULL, 0}
 };