VirtualBox

Changeset 62585 in vbox for trunk/src


Ignore:
Timestamp:
Jul 27, 2016 11:51:17 AM (8 years ago)
Author:
vboxsync
Message:

Audio: Cleanup: Renamed VBOX_WITH_[OSS|ALSA|PULSE] -> VBOX_WITH_AUDIO_[OSS|ALSA|PULSE].

Location:
trunk/src/VBox
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Devices/Audio/AudioMixer.cpp

    r62579 r62585  
    277277 *
    278278 * @returns IPRT status code.
    279  * @param   pMixer          Mixer to set master volume for.
    280  * @param   pVol            Volume to set.
     279 * @param   pMixer              Mixer to set master volume for.
     280 * @param   pVol                Volume to set.
    281281 */
    282282int AudioMixerSetMasterVolume(PAUDIOMIXER pMixer, PPDMAUDIOVOLUME pVol)
    … …  
    786786 * Removes all attached streams from a given sink.
    787787 *
    788  * @param pSink         Sink to remove attached streams from.
     788 * @param pSink                 Sink to remove attached streams from.
    789789 */
    790790static void audioMixerSinkRemoveAllStreamsInternal(PAUDMIXSINK pSink)
    … …  
    803803 * Resets the sink's state.
    804804 *
    805  * @param   pSink       Sink to reset.
     805 * @param   pSink               Sink to reset.
    806806 */
    807807static void audioMixerSinkReset(PAUDMIXSINK pSink)
    … …  
    839839 * Removes all attached streams from a given sink.
    840840 *
    841  * @param pSink         Sink to remove attached streams from.
     841 * @param pSink                 Sink to remove attached streams from.
    842842 */
    843843void AudioMixerSinkRemoveAllStreams(PAUDMIXSINK pSink)
    … …  
    892892 *
    893893 * @returns IPRT status code.
    894  * @param   pSink           Sink to set volume for.
    895  * @param   pVol            Volume to set.
     894 * @param   pSink               Sink to set volume for.
     895 * @param   pVol                Volume to set.
    896896 */
    897897int AudioMixerSinkSetVolume(PAUDMIXSINK pSink, PPDMAUDIOVOLUME pVol)

  • trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp

    r61888 r62585  
    3535
    3636#include "VBoxDD.h"
     37#include "DrvAudio.h"
    3738#include "DevIchHdaCodec.h"
    3839#include "DevIchHdaCommon.h"

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

    r62463 r62585  
    4343/* OSS > 3.6 has a new syscall available for querying a bit more detailed information
    4444 * about OSS' audio capabilities. This is handy for e.g. Solaris. */
    45 # define VBOX_WITH_OSS_SYSINFO 1
     45# define VBOX_WITH_AUDIO_OSS_SYSINFO 1
    4646#endif
    4747
    … …  
    597597    int ossVer = -1;
    598598
    599 #ifdef VBOX_WITH_OSS_SYSINFO
     599#ifdef VBOX_WITH_AUDIO_OSS_SYSINFO
    600600    oss_sysinfo ossInfo;
    601601    RT_ZERO(ossInfo);
    … …  
    608608        {
    609609            LogRel2(("OSS: Using version: %d\n", ossVer));
    610 #ifdef VBOX_WITH_OSS_SYSINFO
     610#ifdef VBOX_WITH_AUDIO_OSS_SYSINFO
    611611            err = ioctl(hFile, OSS_SYSINFO, &ossInfo);
    612612            if (err == 0)
    … …  
    635635                pCfg->cMaxStreamsIn   = UINT32_MAX;
    636636                pCfg->cMaxStreamsOut  = UINT32_MAX;
    637 #ifdef VBOX_WITH_OSS_SYSINFO
     637#ifdef VBOX_WITH_AUDIO_OSS_SYSINFO
    638638            }
    639639#endif

  • trunk/src/VBox/Devices/Makefile.kmk

    r62580 r62585  
    564564 endif
    565565
    566  ifdef VBOX_WITH_OSS
    567   VBoxDD_DEFS    += VBOX_WITH_OSS
     566 ifdef VBOX_WITH_AUDIO_OSS
     567  VBoxDD_DEFS    += VBOX_WITH_AUDIO_OSS
    568568  VBoxDD_SOURCES += \
    569569        Audio/DrvHostOSSAudio.cpp
    570570 endif
    571571
    572  ifdef VBOX_WITH_ALSA
    573   VBoxDD_DEFS    += VBOX_WITH_ALSA
     572 ifdef VBOX_WITH_AUDIO_ALSA
     573  VBoxDD_DEFS    += VBOX_WITH_AUDIO_ALSA
    574574  VBoxDD_SOURCES += \
    575575        Audio/DrvHostALSAAudio.cpp \
    … …  
    577577 endif
    578578
    579  ifdef VBOX_WITH_PULSE
    580   VBoxDD_DEFS    += VBOX_WITH_PULSE
     579 ifdef VBOX_WITH_AUDIO_PULSE
     580  VBoxDD_DEFS    += VBOX_WITH_AUDIO_PULSE
    581581  VBoxDD_SOURCES += \
    582582        Audio/DrvHostPulseAudio.cpp \

  • trunk/src/VBox/Devices/build/VBoxDD.cpp

    r62580 r62585  
    289289#endif
    290290#if defined(RT_OS_LINUX)
    291 # ifdef VBOX_WITH_PULSE
     291# ifdef VBOX_WITH_AUDIO_PULSE
    292292    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostPulseAudio);
    293293    if (RT_FAILURE(rc))
    294294        return rc;
    295295# endif
    296 # ifdef VBOX_WITH_ALSA
     296# ifdef VBOX_WITH_AUDIO_ALSA
    297297    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostALSAAudio);
    298298    if (RT_FAILURE(rc))
    299299        return rc;
    300300# endif
    301 # ifdef VBOX_WITH_OSS
     301# ifdef VBOX_WITH_AUDIO_OSS
    302302    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
    303303    if (RT_FAILURE(rc))
    … …  
    306306#endif /* RT_OS_LINUX */
    307307#if defined(RT_OS_FREEBSD)
    308 # ifdef VBOX_WITH_OSS
     308# ifdef VBOX_WITH_AUDIO_OSS
    309309    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
    310310    if (RT_FAILURE(rc))
    … …  
    318318#endif
    319319#if defined(RT_OS_SOLARIS)
    320 # ifdef VBOX_WITH_OSS
     320# ifdef VBOX_WITH_AUDIO_OSS
    321321    rc = pCallbacks->pfnRegister(pCallbacks, &g_DrvHostOSSAudio);
    322322    if (RT_FAILURE(rc))

  • trunk/src/VBox/Devices/build/VBoxDD.h

    r62580 r62585  
    125125extern const PDMDRVREG g_DrvHostDSound;
    126126#endif
    127 #ifdef VBOX_WITH_OSS
     127#ifdef VBOX_WITH_AUDIO_OSS
    128128extern const PDMDRVREG g_DrvHostOSSAudio;
    129129#endif
    130 #ifdef VBOX_WITH_ALSA
     130#ifdef VBOX_WITH_AUDIO_ALSA
    131131extern const PDMDRVREG g_DrvHostALSAAudio;
    132132#endif
    133 #ifdef VBOX_WITH_PULSE
     133#ifdef VBOX_WITH_AUDIO_PULSE
    134134extern const PDMDRVREG g_DrvHostPulseAudio;
    135135#endif

  • trunk/src/VBox/Frontends/VBoxManage/Makefile.kmk

    r62056 r62585  
    2929        $(if $(VBOX_WITH_HOSTNETIF_API), VBOX_WITH_HOSTNETIF_API) \
    3030        $(if $(VBOX_WITH_NETFLT), VBOX_WITH_NETFLT) \
    31         $(if $(VBOX_WITH_OSS), VBOX_WITH_OSS) \
    32         $(if $(VBOX_WITH_ALSA), VBOX_WITH_ALSA) \
    33         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
     31        $(if $(VBOX_WITH_AUDIO_OSS), VBOX_WITH_AUDIO_OSS) \
     32        $(if $(VBOX_WITH_AUDIO_ALSA), VBOX_WITH_AUDIO_ALSA) \
     33        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE) \
    3434        $(if $(VBOX_WITH_SCSI), VBOX_WITH_SCSI) \
    3535        $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

    r62058 r62585  
    802802        {
    803803            RTStrmPrintf(pStrm, ""
    804 #ifdef VBOX_WITH_OSS
     804#ifdef VBOX_WITH_AUDIO_OSS
    805805                                "|oss"
    806806#endif
    807 #ifdef VBOX_WITH_ALSA
     807#ifdef VBOX_WITH_AUDIO_ALSA
    808808                                "|alsa"
    809809#endif
    810 #ifdef VBOX_WITH_PULSE
     810#ifdef VBOX_WITH_AUDIO_PULSE
    811811                                "|pulse"
    812812#endif
    … …  
    815815        if (fFreeBSD)
    816816        {
    817 #ifdef VBOX_WITH_OSS
     817#ifdef VBOX_WITH_AUDIO_OSS
    818818            /* Get the line break sorted when dumping all option variants. */
    819819            if (fDumpOpts)
    … …  
    825825                RTStrmPrintf(pStrm, "|oss");
    826826#endif
    827 #ifdef VBOX_WITH_PULSE
     827#ifdef VBOX_WITH_AUDIO_PULSE
    828828            RTStrmPrintf(pStrm, "|pulse");
    829829#endif

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

    r62056 r62585  
    22862286                }
    22872287#endif /* RT_OS_WINDOWS */
    2288 #ifdef VBOX_WITH_OSS
     2288#ifdef VBOX_WITH_AUDIO_OSS
    22892289                else if (!RTStrICmp(ValueUnion.psz, "oss"))
    22902290                {
    … …  
    22932293                }
    22942294#endif
    2295 #ifdef VBOX_WITH_ALSA
     2295#ifdef VBOX_WITH_AUDIO_ALSA
    22962296                else if (!RTStrICmp(ValueUnion.psz, "alsa"))
    22972297                {
    … …  
    23002300                }
    23012301#endif
    2302 #ifdef VBOX_WITH_PULSE
     2302#ifdef VBOX_WITH_AUDIO_PULSE
    23032303                else if (!RTStrICmp(ValueUnion.psz, "pulse"))
    23042304                {

  • trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

    r62493 r62585  
    123123        $(if $(VBOX_WITH_ADDITIONS_AUTOUPDATE_UI),VBOX_WITH_ADDITIONS_AUTOUPDATE_UI) \
    124124        $(if $(VBOX_WITH_UPDATE_REQUEST),VBOX_WITH_UPDATE_REQUEST) \
    125         $(if $(VBOX_WITH_OSS),VBOX_WITH_OSS) \
    126         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA) \
    127         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE) \
     125        $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS) \
     126        $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA) \
     127        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE) \
    128128        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000) \
    129129        $(if $(VBOX_WITH_NETFLT)$(eq $(KBUILD_TARGET),freebsd),VBOX_WITH_NETFLT) \

  • trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp

    r62056 r62585  
    153153#endif /* Q_OS_WIN */
    154154
    155 #ifdef VBOX_WITH_OSS
     155#ifdef VBOX_WITH_AUDIO_OSS
    156156    m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_OSS));
    157157#endif
    158158
    159 #ifdef VBOX_WITH_ALSA
     159#ifdef VBOX_WITH_AUDIO_ALSA
    160160    m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_ALSA));
    161161#endif
    162162
    163 #ifdef VBOX_WITH_PULSE
     163#ifdef VBOX_WITH_AUDIO_PULSE
    164164    m_pComboAudioDriver->setItemText(++iIndex, gpConverter->toString(KAudioDriverType_Pulse));
    165165#endif
    … …  
    212212# endif /* VBOX_WITH_WINMM */
    213213#endif /* Q_OS_WIN */
    214 #ifdef VBOX_WITH_OSS
     214#ifdef VBOX_WITH_AUDIO_OSS
    215215    m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_OSS);
    216216#endif
    217 #ifdef VBOX_WITH_ALSA
     217#ifdef VBOX_WITH_AUDIO_ALSA
    218218    m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_ALSA);
    219 #endif /* VBOX_WITH_ALSA */
    220 #ifdef VBOX_WITH_PULSE
     219#endif /* VBOX_WITH_AUDIO_ALSA */
     220#ifdef VBOX_WITH_AUDIO_PULSE
    221221    m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_Pulse);
    222 #endif /* VBOX_WITH_PULSE */
     222#endif /* VBOX_WITH_AUDIO_PULSE */
    223223#ifdef Q_OS_MACX
    224224    m_pComboAudioDriver->insertItem(++iIndex, "", KAudioDriverType_CoreAudio);

  • trunk/src/VBox/Main/Makefile.kmk

    r62580 r62585  
    271271        $(if $(VBOX_WITH_QTGUI),VBOX_WITH_QTGUI,) \
    272272        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    273         $(if $(VBOX_WITH_OSS),VBOX_WITH_OSS,) \
    274         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
    275         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
     273        $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS,) \
     274        $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA,) \
     275        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE,) \
    276276        $(if $(VBOX_WITH_AUDIO_DEBUG),VBOX_WITH_AUDIO_DEBUG,) \
    277277        $(if $(VBOX_WITH_VRDE_AUDIO),VBOX_WITH_VRDE_AUDIO,) \
    … …  
    643643        VBOX_COM_INPROC \
    644644        $(if $(VBOX_WITH_HGCM),VBOX_WITH_HGCM,) \
    645         $(if $(VBOX_WITH_OSS),VBOX_WITH_OSS,) \
    646         $(if $(VBOX_WITH_ALSA),VBOX_WITH_ALSA,) \
    647         $(if $(VBOX_WITH_PULSE),VBOX_WITH_PULSE,) \
     645        $(if $(VBOX_WITH_AUDIO_OSS),VBOX_WITH_AUDIO_OSS,) \
     646        $(if $(VBOX_WITH_AUDIO_ALSA),VBOX_WITH_AUDIO_ALSA,) \
     647        $(if $(VBOX_WITH_AUDIO_PULSE),VBOX_WITH_AUDIO_PULSE,) \
    648648        $(if $(VBOX_WITH_VRDE_AUDIO),VBOX_WITH_VRDE_AUDIO,) \
    649649        $(if $(VBOX_WITH_E1000),VBOX_WITH_E1000,) \

  • trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

    r62580 r62585  
    28772877                }
    28782878#endif
    2879 #ifdef VBOX_WITH_OSS
     2879#ifdef VBOX_WITH_AUDIO_OSS
    28802880                case AudioDriverType_OSS:
    28812881                {
    … …  
    28842884                }
    28852885#endif
    2886 #ifdef VBOX_WITH_ALSA
     2886#ifdef VBOX_WITH_AUDIO_ALSA
    28872887                case AudioDriverType_ALSA:
    28882888                {
    … …  
    28912891                }
    28922892#endif
    2893 #ifdef VBOX_WITH_PULSE
     2893#ifdef VBOX_WITH_AUDIO_PULSE
    28942894                case AudioDriverType_Pulse:
    28952895                {

  • trunk/src/VBox/Main/xml/Settings.cpp

    r62363 r62585  
    67016701        case AudioDriverType_DirectSound:
    67026702#endif
    6703 #ifdef VBOX_WITH_OSS
     6703#ifdef VBOX_WITH_AUDIO_OSS
    67046704        case AudioDriverType_OSS:
    67056705#endif
    6706 #ifdef VBOX_WITH_ALSA
     6706#ifdef VBOX_WITH_AUDIO_ALSA
    67076707        case AudioDriverType_ALSA:
    67086708#endif
    6709 #ifdef VBOX_WITH_PULSE
     6709#ifdef VBOX_WITH_AUDIO_PULSE
    67106710        case AudioDriverType_Pulse:
    67116711#endif
    … …  
    67416741    if (s_linuxDriver == (AudioDriverType_T)-1)
    67426742    {
    6743 # ifdef VBOX_WITH_PULSE
     6743# ifdef VBOX_WITH_AUDIO_PULSE
    67446744        /* Check for the pulse library & that the pulse audio daemon is running. */
    67456745        if (RTProcIsRunningByName("pulseaudio") &&
    … …  
    67476747            s_linuxDriver = AudioDriverType_Pulse;
    67486748        else
    6749 # endif /* VBOX_WITH_PULSE */
    6750 # ifdef VBOX_WITH_ALSA
     6749# endif /* VBOX_WITH_AUDIO_PULSE */
     6750# ifdef VBOX_WITH_AUDIO_ALSA
    67516751            /* Check if we can load the ALSA library */
    67526752             if (RTLdrIsLoadable("libasound.so.2"))
    67536753                s_linuxDriver = AudioDriverType_ALSA;
    67546754        else
    6755 # endif /* VBOX_WITH_ALSA */
     6755# endif /* VBOX_WITH_AUDIO_ALSA */
    67566756            s_linuxDriver = AudioDriverType_OSS;
    67576757    }
    … …  
    67626762    return AudioDriverType_MMPM;
    67636763#else /* All other platforms. */
    6764 # ifdef VBOX_WITH_OSS
     6764# ifdef VBOX_WITH_AUDIO_OSS
    67656765    return AudioDriverType_OSS;
    67666766# endif
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette