Merge pull request #217 from AttorneyOnline/kfo-ao2

Final mega-merge with the Killing Fever Online client, along with other associated bugfixes and feature additions.

This commit is release-ready.

1 files changed, 64 insertions, 0 deletions

diff --git a/include/bassopus.h b/include/bassopus.h
new file mode 100644
index 00000000..3d8b131d
--- /dev/null
+++ b/include/bassopus.h
@@ -0,0 +1,64 @@
+/*
+        BASSOPUS 2.4 C/C++ header file
+        Copyright (c) 2012-2015 Un4seen Developments Ltd.
+
+        See the BASSOPUS.CHM file for more detailed documentation
+*/
+
+#ifndef BASSOPUS_H
+#define BASSOPUS_H
+
+#include "bass.h"
+
+#if BASSVERSION != 0x204
+#error conflicting BASS and BASSOPUS versions
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef BASSOPUSDEF
+#define BASSOPUSDEF(f) WINAPI f
+#endif
+
+// BASS_CHANNELINFO type
+#define BASS_CTYPE_STREAM_OPUS 0x11200
+
+// Additional attributes
+#define BASS_ATTRIB_OPUS_ORIGFREQ 0x13000
+#define BASS_ATTRIB_OPUS_GAIN 0x13001
+
+HSTREAM BASSOPUSDEF(BASS_OPUS_StreamCreateFile)(BOOL mem, const void *file,
+                                                QWORD offset, QWORD length,
+                                                DWORD flags);
+HSTREAM BASSOPUSDEF(BASS_OPUS_StreamCreateURL)(const char *url, DWORD offset,
+                                               DWORD flags, DOWNLOADPROC *proc,
+                                               void *user);
+HSTREAM BASSOPUSDEF(BASS_OPUS_StreamCreateFileUser)(DWORD system, DWORD flags,
+                                                    const BASS_FILEPROCS *procs,
+                                                    void *user);
+
+#ifdef __cplusplus
+}
+
+#if defined(_WIN32) && !defined(NOBASSOVERLOADS)
+static inline HSTREAM BASS_OPUS_StreamCreateFile(BOOL mem, const WCHAR *file,
+                                                 QWORD offset, QWORD length,
+                                                 DWORD flags)
+{
+  return BASS_OPUS_StreamCreateFile(mem, (const void *)file, offset, length,
+                                    flags | BASS_UNICODE);
+}
+
+static inline HSTREAM BASS_OPUS_StreamCreateURL(const WCHAR *url, DWORD offset,
+                                                DWORD flags, DOWNLOADPROC *proc,
+                                                void *user)
+{
+  return BASS_OPUS_StreamCreateURL((const char *)url, offset,
+                                   flags | BASS_UNICODE, proc, user);
+}
+#endif
+#endif
+
+#endif