Index: /trunk/include/VBox/log.h =================================================================== --- /trunk/include/VBox/log.h (revision 56647) +++ /trunk/include/VBox/log.h (revision 56648) @@ -60,4 +60,8 @@ /** The default VBox group. */ LOG_GROUP_DEFAULT = RTLOGGROUP_FIRST_USER, + /** Audio mixer group. */ + LOG_GROUP_AUDIO_MIXER, + /** Audio mixer buffer group. */ + LOG_GROUP_AUDIO_MIXER_BUFFER, /** Auto-logon group. */ LOG_GROUP_AUTOLOGON, @@ -78,4 +82,6 @@ /** Generic Device group. */ LOG_GROUP_DEV, + /** AC97 Device group. */ + LOG_GROUP_DEV_AC97, /** ACPI Device group. */ LOG_GROUP_DEV_ACPI, @@ -84,6 +90,4 @@ /** APIC Device group. */ LOG_GROUP_DEV_APIC, - /** Audio Device group. */ - LOG_GROUP_DEV_AUDIO, /** BusLogic SCSI host adapter group. */ LOG_GROUP_DEV_BUSLOGIC, @@ -100,4 +104,8 @@ /** Guest Interface Manager Device group. */ LOG_GROUP_DEV_GIM, + /** HDA Device group. */ + LOG_GROUP_DEV_HDA, + /** HDA Codec Device group. */ + LOG_GROUP_DEV_HDA_CODEC, /** High Precision Event Timer Device group. */ LOG_GROUP_DEV_HPET, @@ -136,4 +144,6 @@ /** RTC Device group. */ LOG_GROUP_DEV_RTC, + /** SB16 Device group. */ + LOG_GROUP_DEV_SB16, /** Serial Device group */ LOG_GROUP_DEV_SERIAL, @@ -162,4 +172,6 @@ /** ACPI driver group */ LOG_GROUP_DRV_ACPI, + /** Audio driver group */ + LOG_GROUP_DRV_AUDIO, /** Block driver group. */ LOG_GROUP_DRV_BLOCK, @@ -172,4 +184,6 @@ /** Floppy media driver group. */ LOG_GROUP_DRV_FLOPPY, + /** Host Audio driver group. */ + LOG_GROUP_DRV_HOST_AUDIO, /** Host Base block driver group. */ LOG_GROUP_DRV_HOST_BASE, @@ -220,4 +234,6 @@ /** VBox HDD container media driver group. */ LOG_GROUP_DRV_VD, + /** VRDE audio driver group. */ + LOG_GROUP_DRV_VRDE_AUDIO, /** Virtual Switch transport driver group */ LOG_GROUP_DRV_VSWITCH, @@ -783,4 +799,6 @@ RT_LOGGROUP_NAMES, \ "DEFAULT", \ + "AUDIO_MIXER", \ + "AUDIO_MIXER_BUFFER", \ "AUTOLOGON", \ "CFGM", \ @@ -792,8 +810,8 @@ "DBGG", \ "DEV", \ + "DEV_AC97", \ "DEV_ACPI", \ "DEV_AHCI", \ "DEV_APIC", \ - "DEV_AUDIO", \ "DEV_BUSLOGIC", \ "DEV_DMA", \ @@ -803,4 +821,6 @@ "DEV_FDC", \ "DEV_GIM", \ + "DEV_HDA", \ + "DEV_HDA_CODEC", \ "DEV_HPET", \ "DEV_IDE", \ @@ -821,4 +841,5 @@ "DEV_PIT", \ "DEV_RTC", \ + "DEV_SB16", \ "DEV_SERIAL", \ "DEV_SMC", \ @@ -834,4 +855,5 @@ "DRV", \ "DRV_ACPI", \ + "DRV_AUDIO", \ "DRV_BLOCK", \ "DRV_CHAR", \ @@ -839,4 +861,5 @@ "DRV_DISPLAY", \ "DRV_FLOPPY", \ + "DRV_HOST_AUDIO", \ "DRV_HOST_BASE", \ "DRV_HOST_DVD", \ @@ -863,4 +886,5 @@ "DRV_VBOXHDD", \ "DRV_VD", \ + "DRV_VRDE_AUDIO", \ "DRV_VSWITCH", \ "DRV_VUSB", \ Index: /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/AudioMixBuffer.cpp (revision 56648) @@ -16,4 +16,6 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_AUDIO_MIXER_BUFFER +#include /* @@ -33,10 +35,4 @@ #include #include /* For RT_BZERO. */ - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #ifdef TESTCASE Index: /trunk/src/VBox/Devices/Audio/AudioMixer.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/AudioMixer.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/AudioMixer.cpp (revision 56648) @@ -17,5 +17,6 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - +#define LOG_GROUP LOG_GROUP_AUDIO_MIXER +#include #include "AudioMixer.h" #include "AudioMixBuffer.h" @@ -30,11 +31,4 @@ #include #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include - static int audioMixerUpdateSinkVolume(PAUDMIXSINK pSink, const PPDMAUDIOVOLUME pVolMaster); Index: /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (revision 56648) @@ -19,4 +19,6 @@ * Header Files * *******************************************************************************/ +#define LOG_GROUP LOG_GROUP_DEV_AC97 +#include #include #include @@ -31,10 +33,4 @@ #include "VBoxDD.h" #include "AudioMixer.h" - -#ifdef LOG_GROUP - #undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include /******************************************************************************* Index: /trunk/src/VBox/Devices/Audio/DevIchHda.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevIchHda.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DevIchHda.cpp (revision 56648) @@ -23,4 +23,6 @@ * Header Files * *******************************************************************************/ +#define LOG_GROUP LOG_GROUP_DEV_HDA +#include #include #include @@ -36,10 +38,4 @@ #endif #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #include "VBoxDD.h" Index: /trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DevIchHdaCodec.cpp (revision 56648) @@ -24,5 +24,5 @@ * Header Files * *******************************************************************************/ -//#define LOG_GROUP LOG_GROUP_DEV_AUDIO +#define LOG_GROUP LOG_GROUP_DEV_HDA_CODEC #include #include Index: /trunk/src/VBox/Devices/Audio/DevSB16.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DevSB16.cpp (revision 56648) @@ -41,5 +41,6 @@ * THE SOFTWARE. */ - +#define LOG_GROUP LOG_GROUP_DEV_SB16 +#include #include #ifdef IN_RING3 @@ -53,10 +54,4 @@ #include "VBoxDD.h" - -#ifdef LOG_GROUP - #undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #include "AudioMixer.h" Index: /trunk/src/VBox/Devices/Audio/DrvAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvAudio.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvAudio.cpp (revision 56648) @@ -43,5 +43,6 @@ * THE SOFTWARE. */ - +#define LOG_GROUP LOG_GROUP_DRV_AUDIO +#include #include #include @@ -55,10 +56,4 @@ #include #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #include "VBoxDD.h" Index: /trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvAudioCommon.cpp (revision 56648) @@ -42,5 +42,6 @@ * THE SOFTWARE. */ - +#define LOG_GROUP LOG_GROUP_DRV_AUDIO +#include #include #include @@ -53,10 +54,4 @@ #include #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #include Index: /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvHostALSAAudio.cpp (revision 56648) @@ -44,5 +44,6 @@ * Header Files * *******************************************************************************/ - +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO +#include #include #include /* For PDMIBASE_2_PDMDRV. */ @@ -60,11 +61,4 @@ #include "VBoxDD.h" - - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include typedef struct ALSAAUDIOSTREAMIN Index: /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvHostCoreAudio.cpp (revision 56648) @@ -15,4 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO +#include + #include "DrvAudio.h" #include "AudioMixBuffer.h" @@ -31,10 +34,4 @@ #include #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include /* TODO: Index: /trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvHostDSound.cpp (revision 56648) @@ -17,5 +17,6 @@ * */ - +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO +#include #include @@ -26,10 +27,4 @@ #include "DrvAudio.h" #include "VBoxDD.h" - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #define DSLOG(a) do { LogRel2(a); } while(0) Index: /trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvHostNullAudio.cpp (revision 56648) @@ -41,4 +41,6 @@ * THE SOFTWARE. */ +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO +#include #include "DrvAudio.h" #include "AudioMixBuffer.h" @@ -49,10 +51,4 @@ #include /* For PDMIBASE_2_PDMDRV. */ #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include typedef struct NULLAUDIOSTREAMOUT Index: /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvHostOSSAudio.cpp (revision 56648) @@ -16,4 +16,6 @@ * -------------------------------------------------------------------- */ +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO +#include #include "DrvAudio.h" #include "AudioMixBuffer.h" @@ -31,11 +33,4 @@ #include /* For PDMIBASE_2_PDMDRV. */ #include - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include - /** Index: /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp =================================================================== --- /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (revision 56647) +++ /trunk/src/VBox/Devices/Audio/DrvHostPulseAudio.cpp (revision 56648) @@ -20,4 +20,6 @@ * Header Files * *******************************************************************************/ +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO +#include #include @@ -38,10 +40,4 @@ #include "VBoxDD.h" - -#ifdef LOG_GROUP -# undef LOG_GROUP -#endif -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include #define VBOX_PULSEAUDIO_MAX_LOG_REL_ERRORS 32 /** @todo Make this configurable thru driver options. */ Index: /trunk/src/VBox/Devices/Audio/alsa_stubs.c =================================================================== --- /trunk/src/VBox/Devices/Audio/alsa_stubs.c (revision 56647) +++ /trunk/src/VBox/Devices/Audio/alsa_stubs.c (revision 56648) @@ -15,8 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO #include #include -#define LOG_GROUP LOG_GROUP_DEV_AUDIO #include #include Index: /trunk/src/VBox/Devices/Audio/pulse_stubs.c =================================================================== --- /trunk/src/VBox/Devices/Audio/pulse_stubs.c (revision 56647) +++ /trunk/src/VBox/Devices/Audio/pulse_stubs.c (revision 56648) @@ -15,8 +15,7 @@ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. */ - +#define LOG_GROUP LOG_GROUP_DRV_HOST_AUDIO #include #include -#define LOG_GROUP LOG_GROUP_DEV_AUDIO #include #include Index: /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (revision 56647) +++ /trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (revision 56648) @@ -20,4 +20,6 @@ * Header Files * *******************************************************************************/ +#define LOG_GROUP LOG_GROUP_DRV_VRDE_AUDIO +#include #include "DrvAudioVRDE.h" #include "ConsoleImpl.h" @@ -38,9 +40,4 @@ #include #include - -#undef LOG_GROUP -#define LOG_GROUP LOG_GROUP_DEV_AUDIO -#include - /******************************************************************************* Index: /trunk/src/VBox/Runtime/VBox/log-vbox.cpp =================================================================== --- /trunk/src/VBox/Runtime/VBox/log-vbox.cpp (revision 56647) +++ /trunk/src/VBox/Runtime/VBox/log-vbox.cpp (revision 56648) @@ -206,4 +206,6 @@ do { if (strcmp(g_apszGroups[def], str)) {printf("%s='%s' expects '%s'\n", #def, g_apszGroups[def], str); RTAssertDoPanic(); } } while (0) ASSERT_LOG_GROUP(DEFAULT); + ASSERT_LOG_GROUP(AUDIO_MIXER); + ASSERT_LOG_GROUP(AUDIO_MIXER_BUFFER); ASSERT_LOG_GROUP(CFGM); ASSERT_LOG_GROUP(CPUM); @@ -213,8 +215,10 @@ ASSERT_LOG_GROUP(DBGF_INFO); ASSERT_LOG_GROUP(DEV); + ASSERT_LOG_GROUP(DEV_AC97); ASSERT_LOG_GROUP(DEV_ACPI); ASSERT_LOG_GROUP(DEV_APIC); - ASSERT_LOG_GROUP(DEV_AUDIO); ASSERT_LOG_GROUP(DEV_FDC); + ASSERT_LOG_GROUP(DEV_HDA); + ASSERT_LOG_GROUP(DEV_HDA_CODEC); ASSERT_LOG_GROUP(DEV_HPET); ASSERT_LOG_GROUP(DEV_IDE); @@ -230,4 +234,5 @@ ASSERT_LOG_GROUP(DEV_PIT); ASSERT_LOG_GROUP(DEV_RTC); + ASSERT_LOG_GROUP(DEV_SB16); ASSERT_LOG_GROUP(DEV_SERIAL); ASSERT_LOG_GROUP(DEV_SMC); @@ -238,6 +243,8 @@ ASSERT_LOG_GROUP(DRV); ASSERT_LOG_GROUP(DRV_ACPI); + ASSERT_LOG_GROUP(DRV_AUDIO); ASSERT_LOG_GROUP(DRV_BLOCK); ASSERT_LOG_GROUP(DRV_FLOPPY); + ASSERT_LOG_GROUP(DRV_HOST_AUDIO); ASSERT_LOG_GROUP(DRV_HOST_DVD); ASSERT_LOG_GROUP(DRV_HOST_FLOPPY); @@ -250,4 +257,5 @@ ASSERT_LOG_GROUP(DRV_USBPROXY); ASSERT_LOG_GROUP(DRV_VBOXHDD); + ASSERT_LOG_GROUP(DRV_VRDE_AUDIO); ASSERT_LOG_GROUP(DRV_VSWITCH); ASSERT_LOG_GROUP(DRV_VUSB);