Skip to content

Commit 8f1ee60

Browse files
committed
Cleanups
1 parent ad9124f commit 8f1ee60

51 files changed

Lines changed: 2491 additions & 1665 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

audio/audio_mixer.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@
4646
#endif
4747

4848
#ifdef HAVE_DR_FLAC
49+
#include <retro_inline.h>
4950
#define DR_FLAC_IMPLEMENTATION
51+
#define DRFLAC_API static INLINE
5052
#include <dr/dr_flac.h>
5153
#endif
5254

@@ -717,7 +719,7 @@ static bool audio_mixer_play_flac(
717719
void *flac_buffer = NULL;
718720
void *resampler_data = NULL;
719721
const retro_resampler_t* resamp = NULL;
720-
drflac *dr_flac = drflac_open_memory((const unsigned char*)sound->types.flac.data,sound->types.flac.size);
722+
drflac *dr_flac = drflac_open_memory((const unsigned char*)sound->types.flac.data, sound->types.flac.size, NULL);
721723

722724
if (!dr_flac)
723725
return false;
@@ -1200,15 +1202,15 @@ static void audio_mixer_mix_flac(float* buffer, size_t num_frames,
12001202
if (voice->types.flac.position == voice->types.flac.samples)
12011203
{
12021204
again:
1203-
temp_samples = (unsigned)drflac_read_f32( voice->types.flac.stream, AUDIO_MIXER_TEMP_BUFFER, temp_buffer);
1205+
temp_samples = (unsigned)drflac_read_pcm_frames_f32( voice->types.flac.stream, AUDIO_MIXER_TEMP_BUFFER, temp_buffer);
12041206
if (temp_samples == 0)
12051207
{
12061208
if (voice->repeat)
12071209
{
12081210
if (voice->stop_cb)
12091211
voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_REPEATED);
12101212

1211-
drflac_seek_to_sample(voice->types.flac.stream,0);
1213+
drflac_seek_to_pcm_frame(voice->types.flac.stream,0);
12121214
goto again;
12131215
}
12141216

audio/dsp_filters/tremolo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ struct tremolo_core
3535
float *wavetable;
3636
float freq;
3737
float depth;
38-
int index;
39-
int maxindex;
38+
unsigned index;
39+
unsigned maxindex;
4040
};
4141

4242
struct tremolo

0 commit comments

Comments
 (0)