From 4899674b6c765370f80f6e57aaddfd2985baf6e5 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Mon, 14 Mar 2011 09:04:41 -0700 Subject: Move ALC_ENUMERATE_ALL_EXT enums to alc.h, to match other systems' headers --- include/AL/alc.h | 9 +++++++++ include/AL/alext.h | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/AL/alc.h b/include/AL/alc.h index 04543a0c..00cb762d 100644 --- a/include/AL/alc.h +++ b/include/AL/alc.h @@ -171,11 +171,20 @@ typedef void ALCvoid; /** * Capture extension */ +#define ALC_EXT_CAPTURE 1 #define ALC_CAPTURE_DEVICE_SPECIFIER 0x310 #define ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER 0x311 #define ALC_CAPTURE_SAMPLES 0x312 +/** + * ALC_ENUMERATE_ALL_EXT enums + */ +#define ALC_ENUMERATE_ALL_EXT 1 +#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 +#define ALC_ALL_DEVICES_SPECIFIER 0x1013 + + /* * Context Management */ diff --git a/include/AL/alext.h b/include/AL/alext.h index 4501cef1..ea27071e 100644 --- a/include/AL/alext.h +++ b/include/AL/alext.h @@ -68,12 +68,6 @@ extern "C" { #define ALC_CHAN_CD_LOKI 0x500003 #endif -#ifndef ALC_ENUMERATE_ALL_EXT -#define ALC_ENUMERATE_ALL_EXT 1 -#define ALC_DEFAULT_ALL_DEVICES_SPECIFIER 0x1012 -#define ALC_ALL_DEVICES_SPECIFIER 0x1013 -#endif - #ifndef AL_EXT_MCFORMATS #define AL_EXT_MCFORMATS 1 #define AL_FORMAT_QUAD8 0x1204 -- cgit v1.2.3