2019-06-03 16:10:22 -07:00
|
|
|
From 0204d4b3482b55cf3b4d74bbcabd8e95e6e192ef Mon Sep 17 00:00:00 2001
|
2015-03-27 14:24:40 -07:00
|
|
|
From: Mark Harmstone <mark@harmstone.com>
|
|
|
|
Date: Sun, 15 Mar 2015 18:04:16 +0000
|
2019-06-03 16:10:22 -07:00
|
|
|
Subject: [PATCH] dsound: Add EAX v1 constants and structs.
|
2015-03-27 14:24:40 -07:00
|
|
|
|
|
|
|
---
|
2019-06-03 16:10:22 -07:00
|
|
|
dlls/dsound/dsound_eax.h | 89 ++++++++++++++++++++++++++++++++++++
|
2015-03-27 14:24:40 -07:00
|
|
|
dlls/dsound/dsound_private.h | 1 +
|
|
|
|
2 files changed, 90 insertions(+)
|
|
|
|
create mode 100644 dlls/dsound/dsound_eax.h
|
|
|
|
|
|
|
|
diff --git a/dlls/dsound/dsound_eax.h b/dlls/dsound/dsound_eax.h
|
|
|
|
new file mode 100644
|
2017-06-22 21:14:34 -07:00
|
|
|
index 00000000000..600029fa94f
|
2015-03-27 14:24:40 -07:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/dlls/dsound/dsound_eax.h
|
|
|
|
@@ -0,0 +1,89 @@
|
|
|
|
+/*
|
|
|
|
+ * Copyright (c) 2015 Mark Harmstone
|
|
|
|
+ *
|
|
|
|
+ * This library is free software; you can redistribute it and/or
|
|
|
|
+ * modify it under the terms of the GNU Lesser General Public
|
|
|
|
+ * License as published by the Free Software Foundation; either
|
|
|
|
+ * version 2.1 of the License, or (at your option) any later version.
|
|
|
|
+ *
|
|
|
|
+ * This library is distributed in the hope that it will be useful,
|
|
|
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
+ * Lesser General Public License for more details.
|
|
|
|
+ *
|
|
|
|
+ * You should have received a copy of the GNU Lesser General Public
|
|
|
|
+ * License along with this library; if not, write to the Free Software
|
|
|
|
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
+ */
|
|
|
|
+
|
|
|
|
+#ifndef DSOUND_EAX_H_DEFINED
|
|
|
|
+#define DSOUND_EAX_H_DEFINED
|
|
|
|
+
|
|
|
|
+#ifdef __cplusplus
|
|
|
|
+extern "C" {
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+DEFINE_GUID(DSPROPSETID_EAX_ReverbProperties, 0x4a4e6fc1, 0xc341, 0x11d1, 0xb7, 0x3a, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00);
|
|
|
|
+DEFINE_GUID(DSPROPSETID_EAXBUFFER_ReverbProperties, 0x4a4e6fc0, 0xc341, 0x11d1, 0xb7, 0x3a, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00);
|
|
|
|
+
|
|
|
|
+typedef enum {
|
|
|
|
+ DSPROPERTY_EAX_ALL,
|
|
|
|
+ DSPROPERTY_EAX_ENVIRONMENT,
|
|
|
|
+ DSPROPERTY_EAX_VOLUME,
|
|
|
|
+ DSPROPERTY_EAX_DECAYTIME,
|
|
|
|
+ DSPROPERTY_EAX_DAMPING
|
|
|
|
+} DSPROPERTY_EAX_REVERBPROPERTY;
|
|
|
|
+
|
|
|
|
+typedef struct {
|
|
|
|
+ unsigned long environment;
|
|
|
|
+ float fVolume;
|
|
|
|
+ float fDecayTime_sec;
|
|
|
|
+ float fDamping;
|
|
|
|
+} EAX_REVERBPROPERTIES;
|
|
|
|
+
|
|
|
|
+enum {
|
|
|
|
+ EAX_ENVIRONMENT_GENERIC,
|
|
|
|
+ EAX_ENVIRONMENT_PADDEDCELL,
|
|
|
|
+ EAX_ENVIRONMENT_ROOM,
|
|
|
|
+ EAX_ENVIRONMENT_BATHROOM,
|
|
|
|
+ EAX_ENVIRONMENT_LIVINGROOM,
|
|
|
|
+ EAX_ENVIRONMENT_STONEROOM,
|
|
|
|
+ EAX_ENVIRONMENT_AUDITORIUM,
|
|
|
|
+ EAX_ENVIRONMENT_CONCERTHALL,
|
|
|
|
+ EAX_ENVIRONMENT_CAVE,
|
|
|
|
+ EAX_ENVIRONMENT_ARENA,
|
|
|
|
+ EAX_ENVIRONMENT_HANGAR,
|
|
|
|
+ EAX_ENVIRONMENT_CARPETEDHALLWAY,
|
|
|
|
+ EAX_ENVIRONMENT_HALLWAY,
|
|
|
|
+ EAX_ENVIRONMENT_STONECORRIDOR,
|
|
|
|
+ EAX_ENVIRONMENT_ALLEY,
|
|
|
|
+ EAX_ENVIRONMENT_FOREST,
|
|
|
|
+ EAX_ENVIRONMENT_CITY,
|
|
|
|
+ EAX_ENVIRONMENT_MOUNTAINS,
|
|
|
|
+ EAX_ENVIRONMENT_QUARRY,
|
|
|
|
+ EAX_ENVIRONMENT_PLAIN,
|
|
|
|
+ EAX_ENVIRONMENT_PARKINGLOT,
|
|
|
|
+ EAX_ENVIRONMENT_SEWERPIPE,
|
|
|
|
+ EAX_ENVIRONMENT_UNDERWATER,
|
|
|
|
+ EAX_ENVIRONMENT_DRUGGED,
|
|
|
|
+ EAX_ENVIRONMENT_DIZZY,
|
|
|
|
+ EAX_ENVIRONMENT_PSYCHOTIC,
|
|
|
|
+ EAX_ENVIRONMENT_COUNT
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+typedef enum {
|
|
|
|
+ DSPROPERTY_EAXBUFFER_ALL,
|
|
|
|
+ DSPROPERTY_EAXBUFFER_REVERBMIX
|
|
|
|
+} DSPROPERTY_EAXBUFFER_REVERBPROPERTY;
|
|
|
|
+
|
|
|
|
+typedef struct {
|
|
|
|
+ float fMix;
|
|
|
|
+} EAXBUFFER_REVERBPROPERTIES;
|
|
|
|
+
|
|
|
|
+#define EAX_REVERBMIX_USEDISTANCE -1.0f
|
|
|
|
+
|
|
|
|
+#ifdef __cplusplus
|
|
|
|
+}
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
+#endif
|
|
|
|
diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
|
2019-06-03 16:10:22 -07:00
|
|
|
index b19acba2b98..eb9f5c9e3bc 100644
|
2015-03-27 14:24:40 -07:00
|
|
|
--- a/dlls/dsound/dsound_private.h
|
|
|
|
+++ b/dlls/dsound/dsound_private.h
|
|
|
|
@@ -29,6 +29,7 @@
|
|
|
|
#include "mediaobj.h"
|
|
|
|
#include "mmsystem.h"
|
|
|
|
#include "uuids.h"
|
|
|
|
+#include "dsound_eax.h"
|
|
|
|
|
|
|
|
#include "wine/list.h"
|
2019-06-03 16:10:22 -07:00
|
|
|
|
2015-03-28 13:17:21 -07:00
|
|
|
--
|
2019-06-03 16:10:22 -07:00
|
|
|
2.17.1
|
2015-03-27 14:24:40 -07:00
|
|
|
|