diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-01-07 21:01:44 +0100 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-01-07 21:13:46 +0100 |
| commit | ef13866af6e08797030865a33a1d5ba260a833bf (patch) | |
| tree | df0b001d6d4b5e98e83488fac1b26f9632346e10 /src/audio/sampman_oal.cpp | |
| parent | missing changes (diff) | |
| download | re3-ef13866af6e08797030865a33a1d5ba260a833bf.tar re3-ef13866af6e08797030865a33a1d5ba260a833bf.tar.gz re3-ef13866af6e08797030865a33a1d5ba260a833bf.tar.bz2 re3-ef13866af6e08797030865a33a1d5ba260a833bf.tar.lz re3-ef13866af6e08797030865a33a1d5ba260a833bf.tar.xz re3-ef13866af6e08797030865a33a1d5ba260a833bf.tar.zst re3-ef13866af6e08797030865a33a1d5ba260a833bf.zip | |
Diffstat (limited to 'src/audio/sampman_oal.cpp')
| -rw-r--r-- | src/audio/sampman_oal.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp index 07d943e3..bb7f0aac 100644 --- a/src/audio/sampman_oal.cpp +++ b/src/audio/sampman_oal.cpp @@ -30,7 +30,7 @@ #include "MusicManager.h" #include "Frontend.h" #include "Timer.h" -#ifdef AUDIO_OPUS +#ifdef AUDIO_OAL_USE_OPUS #include <opusfile.h> #endif @@ -83,7 +83,7 @@ char SampleBankDescFilename[] = "audio/sfx.SDT"; char SampleBankDataFilename[] = "audio/sfx.RAW"; FILE *fpSampleDescHandle; -#ifdef AUDIO_OPUS +#ifdef OPUS_SFX OggOpusFile *fpSampleDataHandle; #else FILE *fpSampleDataHandle; @@ -1218,7 +1218,7 @@ cSampleManager::LoadSampleBank(uint8 nBank) return false; } -#ifdef AUDIO_OPUS +#ifdef OPUS_SFX int samplesRead = 0; int samplesSize = nSampleBankSize[nBank] / 2; op_pcm_seek(fpSampleDataHandle, 0); @@ -1331,7 +1331,7 @@ cSampleManager::LoadPedComment(uint32 nComment) } } -#ifdef AUDIO_OPUS +#ifdef OPUS_SFX int samplesRead = 0; int samplesSize = m_aSamples[nComment].nSize / 2; op_pcm_seek(fpSampleDataHandle, m_aSamples[nComment].nOffset / 2); @@ -1978,7 +1978,7 @@ cSampleManager::InitialiseSampleBanks(void) fpSampleDescHandle = fcaseopen(SampleBankDescFilename, "rb"); if ( fpSampleDescHandle == NULL ) return false; -#ifndef AUDIO_OPUS +#ifndef OPUS_SFX fpSampleDataHandle = fcaseopen(SampleBankDataFilename, "rb"); if ( fpSampleDataHandle == NULL ) { @@ -1996,7 +1996,7 @@ cSampleManager::InitialiseSampleBanks(void) fpSampleDataHandle = op_open_file(SampleBankDataFilename, &e); #endif fread(m_aSamples, sizeof(tSample), TOTAL_AUDIO_SAMPLES, fpSampleDescHandle); -#ifdef AUDIO_OPUS +#ifdef OPUS_SFX int32 _nSampleDataEndOffset = m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nOffset + m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nSize; #endif fclose(fpSampleDescHandle); |