Merge KFO source unconditionally into AO2

1 files changed, 14 insertions, 4 deletions

diff --git a/include/bass.h b/include/bass.h
index 068b963c..ec2c7a29 100644
--- a/include/bass.h
+++ b/include/bass.h
@@ -1,6 +1,6 @@
 /*
         BASS 2.4 C/C++ header file
-        Copyright (c) 1999-2018 Un4seen Developments Ltd.
+        Copyright (c) 1999-2019 Un4seen Developments Ltd.
 
         See the BASS.CHM file for more detailed documentation
 */
@@ -117,6 +117,7 @@ typedef DWORD HPLUGIN;  // Plugin handle
 #define BASS_CONFIG_VERIFY 23
 #define BASS_CONFIG_UPDATETHREADS 24
 #define BASS_CONFIG_DEV_BUFFER 27
+#define BASS_CONFIG_REC_LOOPBACK 28
 #define BASS_CONFIG_VISTA_TRUEPOS 30
 #define BASS_CONFIG_IOS_MIXAUDIO 34
 #define BASS_CONFIG_DEV_DEFAULT 36
@@ -141,11 +142,14 @@ typedef DWORD HPLUGIN;  // Plugin handle
 #define BASS_CONFIG_AM_DISABLE 58
 #define BASS_CONFIG_NET_PLAYLIST_DEPTH 59
 #define BASS_CONFIG_NET_PREBUF_WAIT 60
+#define BASS_CONFIG_WASAPI_PERSIST 65
+#define BASS_CONFIG_REC_WASAPI 66
 
 // BASS_SetConfigPtr options
 #define BASS_CONFIG_NET_AGENT 16
 #define BASS_CONFIG_NET_PROXY 17
 #define BASS_CONFIG_IOS_NOTIFY 46
+#define BASS_CONFIG_LIBSSL 64
 
 // BASS_Init flags
 #define BASS_DEVICE_8BITS 1       // 8 bit
@@ -526,9 +530,10 @@ BASS_STREAMPROC_END flag to end the stream. */
 #define BASS_STREAMPROC_END 0x80000000 // end of user stream flag
 
 // special STREAMPROCs
-#define STREAMPROC_DUMMY (STREAMPROC *)0   // "dummy" stream
-#define STREAMPROC_PUSH (STREAMPROC *)-1   // push stream
-#define STREAMPROC_DEVICE (STREAMPROC *)-2 // device mix stream
+#define STREAMPROC_DUMMY (STREAMPROC *)0      // "dummy" stream
+#define STREAMPROC_PUSH (STREAMPROC *)-1      // push stream
+#define STREAMPROC_DEVICE (STREAMPROC *)-2    // device mix stream
+#define STREAMPROC_DEVICE_3D (STREAMPROC *)-3 // device 3D mix stream
 
 // BASS_StreamCreateFileUser file systems
 #define STREAMFILE_NOBUFFER 0
@@ -584,6 +589,8 @@ user   : The 'user' parameter value given when calling BASS_StreamCreateURL */
 #define BASS_SYNC_MUSICINST 1
 #define BASS_SYNC_MUSICFX 3
 #define BASS_SYNC_OGG_CHANGE 12
+#define BASS_SYNC_DEV_FAIL 14
+#define BASS_SYNC_DEV_FORMAT 15
 #define BASS_SYNC_MIXTIME 0x40000000 // flag: sync at mixtime, else at playtime
 #define BASS_SYNC_ONETIME 0x80000000 // flag: sync only once, else continuously
 
@@ -623,6 +630,7 @@ RETURN : TRUE = continue recording, FALSE = stop */
 #define BASS_ACTIVE_PLAYING 1
 #define BASS_ACTIVE_STALLED 2
 #define BASS_ACTIVE_PAUSED 3
+#define BASS_ACTIVE_PAUSED_DEVICE 4
 
 // Channel attributes
 #define BASS_ATTRIB_FREQ 1
@@ -668,6 +676,7 @@ RETURN : TRUE = continue recording, FALSE = stop */
 #define BASS_DATA_FFT_NOWINDOW 0x20 // FFT flag: no Hanning window
 #define BASS_DATA_FFT_REMOVEDC 0x40 // FFT flag: pre-remove DC bias
 #define BASS_DATA_FFT_COMPLEX 0x80  // FFT flag: return complex data
+#define BASS_DATA_FFT_NYQUIST 0x100 // FFT flag: return extra Nyquist value
 
 // BASS_ChannelGetLevelEx flags
 #define BASS_LEVEL_MONO 1
@@ -1040,6 +1049,7 @@ float BASSDEF(BASS_GetCPU)();
 BOOL BASSDEF(BASS_Start)();
 BOOL BASSDEF(BASS_Stop)();
 BOOL BASSDEF(BASS_Pause)();
+BOOL BASSDEF(BASS_IsStarted)();
 BOOL BASSDEF(BASS_SetVolume)(float volume);
 float BASSDEF(BASS_GetVolume)();