mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-27 00:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

(libretro-common) Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-04-21 20:53:07 +02:00
parent 0c66441d08
commit 6951111459
2 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libretro-common/audio/audio_mix.c
View File

@ -235,14 +235,11 @@ size_t audio_mix_get_chunk_num_samples(audio_chunk_t *chunk)
{
if (chunk->resample)
return chunk->resample_len;
else
return chunk->rwav->numsamples;
}
else
{
/* no other filetypes supported yet */
return 0;
return chunk->rwav->numsamples;
}
/* no other filetypes supported yet */
return 0;
}
/**
@ -262,11 +259,11 @@ int16_t audio_mix_get_chunk_sample(audio_chunk_t *chunk, unsigned channel, size_
if (chunk->rwav)
{
int sample_size = chunk->rwav->bitspersample / 8;
int sample_size = chunk->rwav->bitspersample / 8;
int16_t sample_out = 0;
/* 0 is the first/left channel */
uint8_t *sample;
uint8_t *sample = NULL;
if (chunk->resample)
sample = (uint8_t*)chunk->resample_buf +
@ -279,11 +276,9 @@ int16_t audio_mix_get_chunk_sample(audio_chunk_t *chunk, unsigned channel, size_
return sample_out;
}
else
{
/* no other filetypes supported yet */
return 0;
}
/* no other filetypes supported yet */
return 0;
}
int16_t* audio_mix_get_chunk_samples(audio_chunk_t *chunk)
@ -313,9 +308,7 @@ int audio_mix_get_chunk_num_channels(audio_chunk_t *chunk)
if (chunk->rwav)
return chunk->rwav->numchannels;
else
{
/* don't support other formats yet */
return 0;
}
/* don't support other formats yet */
return 0;
}

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

@ -317,7 +317,7 @@ audio_mixer_sound_t* audio_mixer_load_ogg(const char* path)
return NULL;
}
sound->type = AUDIO_MIXER_TYPE_OGG;
sound->type = AUDIO_MIXER_TYPE_OGG;
sound->types.ogg.size = size;
sound->types.ogg.data = buffer;