From e9c7607a4b9e31528efb384ab5fb7c03926f7f5e Mon Sep 17 00:00:00 2001
From: andreja6 <andrejaandjic@hotmail.com>
Date: Fri, 27 Apr 2018 00:04:04 -0700
Subject: [PATCH] Added init check

---
 AudioPlayer.cpp | 85 +++++++++++++++++++++++++++----------------------
 1 file changed, 47 insertions(+), 38 deletions(-)

diff --git a/AudioPlayer.cpp b/AudioPlayer.cpp
index 6f4010d..bfbc2c1 100644
--- a/AudioPlayer.cpp
+++ b/AudioPlayer.cpp
@@ -6,6 +6,7 @@
 #include <string.h>
 #define NUM_SOUNDS 10
 static SDL_AudioSpec fmt;
+static bool initiated = false;
 
 AudioPlayer::AudioPlayer(void)
 {
@@ -19,6 +20,7 @@ AudioPlayer::~AudioPlayer(void)
 
 void AudioPlayer::init()
 {
+	initiated = true;
 	extern void mixaudio(void *unused, Uint8 *stream, int len);
 	fmt.freq = 22050;
     fmt.format = AUDIO_S16;
@@ -59,46 +61,53 @@ void mixaudio(void *unused, Uint8 *stream, int len)
 void AudioPlayer::PlaySound(std::string fileString)
 {
 
-	char *file = new char[fileString.length() + 1];
-	strcpy(file, fileString.c_str());
-	
+	if(initiated)
+	{
+		char *file = new char[fileString.length() + 1];
+		strcpy(file, fileString.c_str());
+		
 
-    int index;
-    SDL_AudioSpec wave;
-    Uint8 *data;
-    Uint32 dlen;
-    SDL_AudioCVT cvt;
+		int index;
+		SDL_AudioSpec wave;
+		Uint8 *data;
+		Uint32 dlen;
+		SDL_AudioCVT cvt;
 
-    /* Look for an empty (or finished) sound slot */
-    for ( index=0; index<NUM_SOUNDS; ++index ) {
-        if ( sounds[index].dpos == sounds[index].dlen ) {
-            break;
-        }
-    }
-    if ( index == NUM_SOUNDS )
-        return;
+		/* Look for an empty (or finished) sound slot */
+		for ( index=0; index<NUM_SOUNDS; ++index ) {
+			if ( sounds[index].dpos == sounds[index].dlen ) {
+				break;
+			}
+		}
+		if ( index == NUM_SOUNDS )
+			return;
 
-    /* Load the sound file and convert it to 16-bit stereo at 22kHz */
-    if ( SDL_LoadWAV(file, &wave, &data, &dlen) == NULL ) {
-        fprintf(stderr, "Couldn't load %s: %s\n", file, SDL_GetError());
-        return;
-    }
-    SDL_BuildAudioCVT(&cvt, wave.format, wave.channels, wave.freq,
-                            AUDIO_S16,   2,             fmt.freq);
-    cvt.buf = (Uint8*)malloc(dlen*cvt.len_mult);
-    memcpy(cvt.buf, data, dlen);
-    cvt.len = dlen;
-    SDL_ConvertAudio(&cvt);
-    SDL_FreeWAV(data);
+		/* Load the sound file and convert it to 16-bit stereo at 22kHz */
+		if ( SDL_LoadWAV(file, &wave, &data, &dlen) == NULL ) {
+			fprintf(stderr, "Couldn't load %s: %s\n", file, SDL_GetError());
+			return;
+		}
+		SDL_BuildAudioCVT(&cvt, wave.format, wave.channels, wave.freq,
+								AUDIO_S16,   2,             fmt.freq);
+		cvt.buf = (Uint8*)malloc(dlen*cvt.len_mult);
+		memcpy(cvt.buf, data, dlen);
+		cvt.len = dlen;
+		SDL_ConvertAudio(&cvt);
+		SDL_FreeWAV(data);
 
-    /* Put the sound data in the slot (it starts playing immediately) */
-    if ( sounds[index].data ) {
-        free(sounds[index].data);
-    }
-    SDL_LockAudio();
-    sounds[index].data = cvt.buf;
-    sounds[index].dlen = cvt.len_cvt;
-    sounds[index].dpos = 0;
-    SDL_UnlockAudio();
-	delete [] file;
+		/* Put the sound data in the slot (it starts playing immediately) */
+		if ( sounds[index].data ) {
+			free(sounds[index].data);
+		}
+		SDL_LockAudio();
+		sounds[index].data = cvt.buf;
+		sounds[index].dlen = cvt.len_cvt;
+		sounds[index].dpos = 0;
+		SDL_UnlockAudio();
+		delete [] file;
+	}
+	else
+	{
+		OutputDebugString("Audio player not initialized, sound will not play\r\n");
+	}
 }