Skip to content

Commit

Permalink
rename stream_init -> modaudio_stream_init
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonN committed Sep 19, 2017
1 parent 097c9eb commit d73050e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions addons/acodec/modaudio.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static bool modaudio_stream_set_loop(ALLEGRO_AUDIO_STREAM *stream,
return true;
}

static ALLEGRO_AUDIO_STREAM *stream_init(ALLEGRO_FILE* f,
static ALLEGRO_AUDIO_STREAM *modaudio_stream_init(ALLEGRO_FILE* f,
size_t buffer_count, unsigned int samples
#if (DUMB_MAJOR_VERSION) < 2
/* For DUMB 0.9.3, we must choose a loader function ourselves. */
Expand Down Expand Up @@ -442,7 +442,7 @@ ALLEGRO_AUDIO_STREAM *_al_load_dumb_audio_stream_f(ALLEGRO_FILE *f,
{
if (!init_libdumb())
return NULL;
return stream_init(f, buffer_count, samples);
return modaudio_stream_init(f, buffer_count, samples);
}

#else
Expand Down Expand Up @@ -550,31 +550,31 @@ ALLEGRO_AUDIO_STREAM *_al_load_mod_audio_stream_f(ALLEGRO_FILE *f,
{
if (!init_libdumb())
return NULL;
return stream_init(f, buffer_count, samples, lib.dumb_read_mod);
return modaudio_stream_init(f, buffer_count, samples, lib.dumb_read_mod);
}

ALLEGRO_AUDIO_STREAM *_al_load_it_audio_stream_f(ALLEGRO_FILE *f,
size_t buffer_count, unsigned int samples)
{
if (!init_libdumb())
return NULL;
return stream_init(f, buffer_count, samples, lib.dumb_read_it);
return modaudio_stream_init(f, buffer_count, samples, lib.dumb_read_it);
}

ALLEGRO_AUDIO_STREAM *_al_load_xm_audio_stream_f(ALLEGRO_FILE *f,
size_t buffer_count, unsigned int samples)
{
if (!init_libdumb())
return NULL;
return stream_init(f, buffer_count, samples, lib.dumb_read_xm);
return modaudio_stream_init(f, buffer_count, samples, lib.dumb_read_xm);
}

ALLEGRO_AUDIO_STREAM *_al_load_s3m_audio_stream_f(ALLEGRO_FILE *f,
size_t buffer_count, unsigned int samples)
{
if (!init_libdumb())
return NULL;
return stream_init(f, buffer_count, samples, lib.dumb_read_s3m);
return modaudio_stream_init(f, buffer_count, samples, lib.dumb_read_s3m);
}
#endif // DUMB_MAJOR_VERSION

Expand Down

0 comments on commit d73050e

Please sign in to comment.