ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix inadvertent use of C++11 in core.

This commit is contained in:
Brandon Wright 2019-03-30 19:18:01 -05:00
parent d1d9a2ae51
commit d975010369
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apu/apu.cpp
View File

@ -5,7 +5,6 @@
\*****************************************************************************/ \*****************************************************************************/
#include <cmath> #include <cmath>
#include <vector>
#include "../snes9x.h" #include "../snes9x.h"
#include "apu.h" #include "apu.h"
#include "../msu1.h" #include "../msu1.h"
@ -58,7 +57,8 @@ static double dynamic_rate_multiplier = 1.0;
namespace msu { namespace msu {
// Always 16-bit, Stereo; 1.5x dsp buffer to never overflow // Always 16-bit, Stereo; 1.5x dsp buffer to never overflow
static Resampler *resampler = NULL; static Resampler *resampler = NULL;
static std::vector<int16> resample_buffer; static int16 *resample_buffer = NULL;
static int resample_buffer_size = 0;
} // namespace msu } // namespace msu
static void UpdatePlaybackRate(void); static void UpdatePlaybackRate(void);
@ -85,9 +85,14 @@ bool8 S9xMixSamples(uint8 *dest, int sample_count)
{ {
if (msu::resampler->avail() >= sample_count) if (msu::resampler->avail() >= sample_count)
{ {
if ((int)msu::resample_buffer.size() < sample_count) if (msu::resample_buffer_size < sample_count)
msu::resample_buffer.resize(sample_count); {
msu::resampler->read((short *)msu::resample_buffer.data(), if (msu::resample_buffer)
delete[] msu::resample_buffer;
msu::resample_buffer = new int16[sample_count];
msu::resample_buffer_size = sample_count;
}
msu::resampler->read(msu::resample_buffer,
sample_count); sample_count);
for (int i = 0; i < sample_count; ++i) for (int i = 0; i < sample_count; ++i)
{ {