From 0411aba219f96fab414d7ab588f16222d76f826d Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 8 May 2017 18:11:09 +0200
Subject: [PATCH] (audio_mixer.c) Cleanups

---
 libretro-common/audio/audio_mixer.c         | 11 +++++++----
 libretro-common/include/audio/audio_mixer.h | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c
index f5b5d038c0..7c2864bac2 100644
--- a/libretro-common/audio/audio_mixer.c
+++ b/libretro-common/audio/audio_mixer.c
@@ -50,7 +50,7 @@
 #define AUDIO_MIXER_TYPE_WAV        1
 #define AUDIO_MIXER_TYPE_OGG        2
 
-struct audio_mixer_sound_t
+struct audio_mixer_sound
 {
    unsigned type;
    
@@ -74,12 +74,12 @@ struct audio_mixer_sound_t
    } types;
 };
 
-struct audio_mixer_voice_t
+struct audio_mixer_voice
 {
    unsigned type;
    bool     repeat;
    float    volume;
-   audio_mixer_sound_t*  sound;
+   audio_mixer_sound_t *sound;
    audio_mixer_stop_cb_t stop_cb;
    
    union
@@ -96,7 +96,7 @@ struct audio_mixer_voice_t
          /* ogg */
          unsigned    position;
          unsigned    samples;
-         stb_vorbis* stream;
+         stb_vorbis *stream;
          float*      buffer;
          unsigned    buf_samples;
          void*       resampler_data;
@@ -329,6 +329,9 @@ audio_mixer_sound_t* audio_mixer_load_ogg(const char* path)
 
 void audio_mixer_destroy(audio_mixer_sound_t* sound)
 {
+   if (!sound)
+      return;
+
    switch (sound->type)
    {
       case AUDIO_MIXER_TYPE_WAV:
diff --git a/libretro-common/include/audio/audio_mixer.h b/libretro-common/include/audio/audio_mixer.h
index b2b013166f..7e00581879 100644
--- a/libretro-common/include/audio/audio_mixer.h
+++ b/libretro-common/include/audio/audio_mixer.h
@@ -31,8 +31,8 @@
 
 RETRO_BEGIN_DECLS
 
-typedef struct audio_mixer_sound_t audio_mixer_sound_t;
-typedef struct audio_mixer_voice_t audio_mixer_voice_t;
+typedef struct audio_mixer_sound audio_mixer_sound_t;
+typedef struct audio_mixer_voice audio_mixer_voice_t;
 
 typedef void (*audio_mixer_stop_cb_t)(audio_mixer_voice_t* voice, unsigned reason);
 
@@ -42,6 +42,7 @@ typedef void (*audio_mixer_stop_cb_t)(audio_mixer_voice_t* voice, unsigned reaso
 #define AUDIO_MIXER_SOUND_REPEATED 2
 
 void audio_mixer_init(unsigned rate);
+
 void audio_mixer_done(void);
 
 audio_mixer_sound_t* audio_mixer_load_wav(const char* path);
@@ -49,8 +50,10 @@ audio_mixer_sound_t* audio_mixer_load_ogg(const char* path);
 
 void audio_mixer_destroy(audio_mixer_sound_t* sound);
 
-audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound, bool repeat, float volume, audio_mixer_stop_cb_t stop_cb);
-void                 audio_mixer_stop(audio_mixer_voice_t* voice);
+audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound,
+      bool repeat, float volume, audio_mixer_stop_cb_t stop_cb);
+
+void audio_mixer_stop(audio_mixer_voice_t* voice);
 
 void audio_mixer_mix(float* buffer, size_t num_frames);