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

Cleanup

This commit is contained in:
twinaphex 2017-05-16 23:12:03 +02:00
parent acbf11931b
commit efacf637db
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libretro-common/audio/audio_mixer.c
View File

@ -45,6 +45,30 @@
#define AUDIO_MIXER_MAX_VOICES 8 #define AUDIO_MIXER_MAX_VOICES 8
#define AUDIO_MIXER_TEMP_OGG_BUFFER 8192 #define AUDIO_MIXER_TEMP_OGG_BUFFER 8192
struct audio_mixer_sound
{
enum audio_mixer_type type;
union
{
struct
{
/* wav */
unsigned frames;
const float* pcm;
} wav;
#ifdef HAVE_STB_VORBIS
struct
{
/* ogg */
unsigned size;
const void* data;
} ogg;
#endif
} types;
};
struct audio_mixer_voice struct audio_mixer_voice
{ {
bool repeat; bool repeat;

24
libretro-common/include/audio/audio_mixer.h
View File

@ -43,30 +43,6 @@ enum audio_mixer_type
AUDIO_MIXER_TYPE_OGG AUDIO_MIXER_TYPE_OGG
}; };
struct audio_mixer_sound
{
enum audio_mixer_type type;
union
{
struct
{
/* wav */
unsigned frames;
const float* pcm;
} wav;
#ifdef HAVE_STB_VORBIS
struct
{
/* ogg */
unsigned size;
const void* data;
} ogg;
#endif
} types;
};
typedef struct audio_mixer_sound audio_mixer_sound_t; typedef struct audio_mixer_sound audio_mixer_sound_t;
typedef struct audio_mixer_voice audio_mixer_voice_t; typedef struct audio_mixer_voice audio_mixer_voice_t;