summaryrefslogtreecommitdiffstats
path: root/src/audio/sampman.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-08-15 14:39:30 +0200
committerGitHub <noreply@github.com>2019-08-15 14:39:30 +0200
commit88fcac85d32e5bef978a3a1e4d3ace0fcce09815 (patch)
tree53c3fb8df01552a4742ef96f418d469677409a9c /src/audio/sampman.h
parentMerge pull request #189 from Nick007J/master (diff)
parentfix (diff)
downloadre3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.tar
re3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.tar.gz
re3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.tar.bz2
re3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.tar.lz
re3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.tar.xz
re3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.tar.zst
re3-88fcac85d32e5bef978a3a1e4d3ace0fcce09815.zip
Diffstat (limited to '')
-rw-r--r--src/audio/sampman.h37
1 files changed, 20 insertions, 17 deletions
diff --git a/src/audio/sampman.h b/src/audio/sampman.h
index ba2381b5..def4853f 100644
--- a/src/audio/sampman.h
+++ b/src/audio/sampman.h
@@ -2,6 +2,8 @@
#include "common.h"
#include "AudioSamples.h"
+#define MAX_VOLUME 127
+
struct tSample {
int32 nOffset;
uint32 nSize;
@@ -10,30 +12,31 @@ struct tSample {
int32 nLoopEnd;
};
-#define MAXPROVIDERS 64
-
-#define MAXCHANNELS 28
-#define MAXCHANNELS_SURROUND 24
-#define MAX2DCHANNELS 1
-#define CHANNEL2D MAXCHANNELS
+enum
+{
+ SAMPLEBANK_MAIN,
+ SAMPLEBANK_PED,
+ MAX_SAMPLEBANKS,
+};
+#define MAX_PEDSFX 7
+#define PED_BLOCKSIZE 79000
-#define MAX_MP3STREAMS 2
+#define MAXPROVIDERS 64
+#define MAXCHANNELS 28
+#define MAXCHANNELS_SURROUND 24
+#define MAX2DCHANNELS 1
+#define CHANNEL2D MAXCHANNELS
-#define MAX_SAMPLEBANKS 2
-#define MAX_PEDSFX 7
-#define PED_BLOCKSIZE 79000
+#define MAX_MP3STREAMS 2
+#define DIGITALRATE 32000
+#define DIGITALBITS 16
+#define DIGITALCHANNELS 2
#define MAX_DIGITAL_MIXER_CHANNELS 32
-#define DIGITALRATE 32000
-#define DIGITALBITS 16
-#define DIGITALCHANNELS 2
-
-
-
class cSampleManager
{
uint8 m_nEffectsVolume;
@@ -98,7 +101,7 @@ public:
int32 _GetPedCommentSlot(uint32 nComment);
- int32 GetSampleBaseFrequency (uint32 nSample);
+ int32 GetSampleBaseFrequency (uint32 nSample);
int32 GetSampleLoopStartOffset(uint32 nSample);
int32 GetSampleLoopEndOffset (uint32 nSample);
uint32 GetSampleLength (uint32 nSample);