VirtualBox

Changeset 88226 in vbox


Ignore:
Timestamp:
Mar 22, 2021 9:13:05 AM (4 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
143413
Message:

Audio: Renamed host audio files to the DrvHostAudioXxxx scheme. bugref:9890

Location:
trunk/src/VBox/Devices
Files:
1 edited
15 moved

Legend:

Unmodified
Added
Removed

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

    r88225 r88226  
    5353
    5454RT_C_DECLS_BEGIN
    55 # include "alsa_stubs.h"
    56 # include "alsa_mangling.h"
     55#include "DrvHostAudioAlsaStubs.h"
     56#include "DrvHostAudioAlsaStubsMangling.h"
    5757RT_C_DECLS_END
    5858

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

    r88225 r88226  
    1515 * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
    1616 */
     17
    1718#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO
    1819#include <iprt/assert.h>
    … …  
    2324#include <alsa/asoundlib.h>
    2425
    25 #include "alsa_stubs.h"
     26#include "DrvHostAudioAlsaStubs.h"
    2627
    2728#define VBOX_ALSA_LIB "libasound.so.2"
    … …  
    3031    static rettype (*pfn_ ## function) signature; \
    3132    \
    32     rettype VBox_##function signature; \
     33    extern "C" rettype VBox_##function signature; \
    3334    rettype VBox_##function signature \
    3435    { \

  • trunk/src/VBox/Devices/Audio/DrvHostAudioAlsaStubs.h

    r88225 r88226  
    1616 */
    1717
    18 #ifndef VBOX_INCLUDED_SRC_Audio_alsa_stubs_h
    19 #define VBOX_INCLUDED_SRC_Audio_alsa_stubs_h
     18#ifndef VBOX_INCLUDED_SRC_Audio_DrvHostAudioAlsaStubs_h
     19#define VBOX_INCLUDED_SRC_Audio_DrvHostAudioAlsaStubs_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    2222#endif
     23
     24#include <iprt/cdefs.h>
     25
     26RT_C_DECLS_BEGIN
    2327extern int audioLoadAlsaLib(void);
    24 #endif /* !VBOX_INCLUDED_SRC_Audio_alsa_stubs_h */
     28RT_C_DECLS_END
    2529
     30#endif /* !VBOX_INCLUDED_SRC_Audio_DrvHostAudioAlsaStubs_h */
     31

  • trunk/src/VBox/Devices/Audio/DrvHostAudioAlsaStubsMangling.h

    r88225 r88226  
    1818 */
    1919
    20 #ifndef VBOX_INCLUDED_SRC_Audio_alsa_mangling_h
    21 #define VBOX_INCLUDED_SRC_Audio_alsa_mangling_h
     20#ifndef VBOX_INCLUDED_SRC_Audio_DrvHostAudioAlsaStubsMangling_h
     21#define VBOX_INCLUDED_SRC_Audio_DrvHostAudioAlsaStubsMangling_h
    2222#ifndef RT_WITHOUT_PRAGMA_ONCE
    2323# pragma once
    … …  
    7171#define snd_pcm_sw_params_sizeof                ALSA_MANGLER(snd_pcm_sw_params_sizeof)
    7272
    73 #endif /* !VBOX_INCLUDED_SRC_Audio_alsa_mangling_h */
     73#endif /* !VBOX_INCLUDED_SRC_Audio_DrvHostAudioAlsaStubsMangling_h */

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

    r88225 r88226  
    3232#include <iprt/semaphore.h>
    3333
    34 RT_C_DECLS_BEGIN
    35 # include "pulse_mangling.h"
    36 # include "pulse_stubs.h"
    37 RT_C_DECLS_END
     34#include "DrvHostAudioPulseAudioStubsMangling.h"
     35#include "DrvHostAudioPulseAudioStubs.h"
    3836
    3937#include <pulse/pulseaudio.h>

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

    r88225 r88226  
    2828#include <pulse/pulseaudio.h>
    2929
    30 #include "pulse_stubs.h"
     30#include "DrvHostAudioPulseAudioStubs.h"
    3131
    3232
    … …  
    3939    static rettype (*g_pfn_ ## function) signature; \
    4040    \
    41     rettype VBox_##function signature; \
     41    extern "C" rettype VBox_##function signature; \
    4242    rettype VBox_##function signature \
    4343    { \
    … …  
    4848    static void (*g_pfn_ ## function) signature; \
    4949    \
    50     void VBox_##function signature; \
     50    extern "C" void VBox_##function signature; \
    5151    void VBox_##function signature \
    5252    { \

  • trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudioStubs.h

    r88225 r88226  
    1616 */
    1717
    18 #ifndef VBOX_INCLUDED_SRC_Audio_pulse_stubs_h
    19 #define VBOX_INCLUDED_SRC_Audio_pulse_stubs_h
     18#ifndef VBOX_INCLUDED_SRC_Audio_DrvHostAudioPulseAudioStubs_h
     19#define VBOX_INCLUDED_SRC_Audio_DrvHostAudioPulseAudioStubs_h
    2020#ifndef RT_WITHOUT_PRAGMA_ONCE
    2121# pragma once
    2222#endif
     23
     24#include <iprt/cdefs.h>
     25
     26RT_C_DECLS_BEGIN
    2327extern int audioLoadPulseLib(void);
    24 #endif /* !VBOX_INCLUDED_SRC_Audio_pulse_stubs_h */
     28RT_C_DECLS_END
    2529
     30#endif /* !VBOX_INCLUDED_SRC_Audio_DrvHostAudioPulseAudioStubs_h */
     31

  • trunk/src/VBox/Devices/Audio/DrvHostAudioPulseAudioStubsMangling.h

    r88225 r88226  
    1818 */
    1919
    20 #ifndef VBOX_INCLUDED_SRC_Audio_pulse_mangling_h
    21 #define VBOX_INCLUDED_SRC_Audio_pulse_mangling_h
     20#ifndef VBOX_INCLUDED_SRC_Audio_DrvHostAudioPulseAudioStubsMangling_h
     21#define VBOX_INCLUDED_SRC_Audio_DrvHostAudioPulseAudioStubsMangling_h
    2222#ifndef RT_WITHOUT_PRAGMA_ONCE
    2323# pragma once
    … …  
    9090#define pa_usec_to_bytes                        PULSE_MANGLER(pa_usec_to_bytes)
    9191
    92 #endif /* !VBOX_INCLUDED_SRC_Audio_pulse_mangling_h */
     92#endif /* !VBOX_INCLUDED_SRC_Audio_DrvHostAudioPulseAudioStubsMangling_h */
    9393

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

    r88170 r88226  
    642642        Audio/DrvAudio.cpp \
    643643        Audio/DrvAudioCommon.cpp \
    644         Audio/DrvHostNullAudio.cpp
     644        Audio/DrvHostAudioNull.cpp
    645645
    646646 ifdef VBOX_WITH_AUDIO_DEBUG
    647647  VBoxDD_DEFS    += VBOX_WITH_AUDIO_DEBUG
    648648  VBoxDD_SOURCES += \
    649         Audio/DrvHostDebugAudio.cpp
     649        Audio/DrvHostAudioDebug.cpp
    650650 endif
    651651
    … …  
    653653  VBoxDD_DEFS    += VBOX_WITH_AUDIO_VALIDATIONKIT
    654654  VBoxDD_SOURCES += \
    655         Audio/DrvHostValidationKit.cpp
     655        Audio/DrvHostAudioValidationKit.cpp
    656656 endif
    657657
    658658 ifeq ($(KBUILD_TARGET),darwin)
    659659  VBoxDD_SOURCES += \
    660         Audio/DrvHostCoreAudio.cpp \
    661         Audio/DrvHostCoreAudio-auth.mm
     660        Audio/DrvHostAudioCoreAudio.cpp \
     661        Audio/DrvHostAudioCoreAudioAuth.mm
    662662 endif
    663663
    … …  
    675675  VBoxDD_DEFS    += VBOX_WITH_AUDIO_OSS
    676676  VBoxDD_SOURCES += \
    677         Audio/DrvHostOSSAudio.cpp
     677        Audio/DrvHostAudioOss.cpp
    678678 endif
    679679
    … …  
    681681  VBoxDD_DEFS    += VBOX_WITH_AUDIO_ALSA
    682682  VBoxDD_SOURCES += \
    683         Audio/DrvHostALSAAudio.cpp \
    684         Audio/alsa_stubs.c
     683        Audio/DrvHostAudioAlsa.cpp \
     684        Audio/DrvHostAudioAlsaStubs.cpp
    685685 endif
    686686
    … …  
    688688  VBoxDD_DEFS    += VBOX_WITH_AUDIO_PULSE
    689689  VBoxDD_SOURCES += \
    690         Audio/DrvHostPulseAudio.cpp \
    691         Audio/pulse_stubs.c
     690        Audio/DrvHostAudioPulseAudio.cpp \
     691        Audio/DrvHostAudioPulseAudioStubs.cpp
    692692 endif
    693693
Note: See TracChangeset for help on using the changeset viewer.

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