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

spu2x-sdl: unique_ptr is always supported 

So let's drop various ifdef
This commit is contained in:
Gregory Hainaut 2015-10-21 20:36:07 +02:00
parent 2b06d34279
commit 96bf714d85
1 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/spu2-x/src/SndOut_SDL.cpp
View File

@ -19,11 +19,7 @@
#include "Global.h" #include "Global.h"
#include "SndOut.h" #include "SndOut.h"
#if __cplusplus >= 201103L
#include <memory> #include <memory>
#else
#include <cstddef>
#endif
/* Using SDL2 requires other SDL dependencies in pcsx2 get upgraded as well, or the /* Using SDL2 requires other SDL dependencies in pcsx2 get upgraded as well, or the
* symbol tables would conflict. Other dependencies in Linux are wxwidgets (you can * symbol tables would conflict. Other dependencies in Linux are wxwidgets (you can
@ -54,11 +50,7 @@ namespace {
Uint16 samples = desiredSamples; Uint16 samples = desiredSamples;
#if __cplusplus >= 201103L
std::unique_ptr<StereoOut_SDL[]> buffer; std::unique_ptr<StereoOut_SDL[]> buffer;
#else
StereoOut_SDL *buffer = NULL;
#endif
void callback_fillBuffer(void *userdata, Uint8 *stream, int len) { void callback_fillBuffer(void *userdata, Uint8 *stream, int len) {
// Length should always be samples in bytes. // Length should always be samples in bytes.
@ -66,11 +58,7 @@ namespace {
for(Uint16 i = 0; i < samples; i += SndOutPacketSize) for(Uint16 i = 0; i < samples; i += SndOutPacketSize)
SndBuffer::ReadSamples(&buffer[i]); SndBuffer::ReadSamples(&buffer[i]);
#if __cplusplus >= 201103L
SDL_MixAudio(stream, (Uint8*) buffer.get() , len, SDL_MIX_MAXVOLUME); SDL_MixAudio(stream, (Uint8*) buffer.get() , len, SDL_MIX_MAXVOLUME);
#else
SDL_MixAudio(stream, (Uint8*) buffer , len, SDL_MIX_MAXVOLUME);
#endif
} }
} }
@ -88,11 +76,7 @@ struct SDLAudioMod : public SndOutModule {
} }
/* This is so ugly. It is hilariously ugly. I didn't use a vector to save reallocs. */ /* This is so ugly. It is hilariously ugly. I didn't use a vector to save reallocs. */
if(samples != spec.samples || buffer == NULL) if(samples != spec.samples || buffer == NULL)
#if __cplusplus >= 201103L
buffer = std::unique_ptr<StereoOut_SDL[]>(new StereoOut_SDL[spec.samples]); buffer = std::unique_ptr<StereoOut_SDL[]>(new StereoOut_SDL[spec.samples]);
#else
buffer = new StereoOut_SDL[spec.samples];
#endif
if(samples != spec.samples) { if(samples != spec.samples) {
// Samples must always be a multiple of packet size. // Samples must always be a multiple of packet size.
assert(spec.samples % SndOutPacketSize == 0); assert(spec.samples % SndOutPacketSize == 0);
@ -107,10 +91,6 @@ struct SDLAudioMod : public SndOutModule {
void Close() { void Close() {
SDL_CloseAudio(); SDL_CloseAudio();
#if __cplusplus < 201103L
delete[] buffer;
buffer = NULL;
#endif
} }
s32 Test() const { return 0; } s32 Test() const { return 0; }