From 7d9adc8d14d5c66b2549eb27a06cc66e03f09f65 Mon Sep 17 00:00:00 2001 From: Sebastian Krzyszkowiak Date: Thu, 3 Jan 2019 06:57:26 +0100 Subject: [PATCH] emscripten: fix a typo in al_get_audio_stream_length_secs stub --- src/emscripten-audio-stream.c | 8 ++++---- src/emscripten-audio-stream.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/emscripten-audio-stream.c b/src/emscripten-audio-stream.c index 5e101a4..67aa994 100644 --- a/src/emscripten-audio-stream.c +++ b/src/emscripten-audio-stream.c @@ -37,7 +37,7 @@ #undef al_get_audio_stream_playing #undef al_get_audio_stream_playmode #undef al_get_audio_stream_attached -#undef al_get_audio_stream_length_sec +#undef al_get_audio_stream_length_secs #undef al_get_audio_stream_position_secs #undef al_get_audio_stream_played_samples #undef al_get_audio_stream_fragment @@ -205,7 +205,7 @@ SYMBOL_EXPORT unsigned int emscripten_get_available_audio_stream_fragments(ALLEG return 0; } -SYMBOL_EXPORT double emscripten_get_audio_stream_length_sec(ALLEGRO_AUDIO_STREAM *stream) { +SYMBOL_EXPORT double emscripten_get_audio_stream_length_secs(ALLEGRO_AUDIO_STREAM *stream) { EMSCRIPTEN_AUDIO_STREAM *s = (EMSCRIPTEN_AUDIO_STREAM*)stream; unsigned int samples_per_sec = al_get_sample_instance_frequency(s->instance); return al_get_sample_instance_length(s->instance) / (double)samples_per_sec; @@ -213,7 +213,7 @@ SYMBOL_EXPORT double emscripten_get_audio_stream_length_sec(ALLEGRO_AUDIO_STREAM SYMBOL_EXPORT bool emscripten_seek_audio_stream_secs(ALLEGRO_AUDIO_STREAM *stream, double val) { EMSCRIPTEN_AUDIO_STREAM *s = (EMSCRIPTEN_AUDIO_STREAM*)stream; - double length = emscripten_get_audio_stream_length_sec(stream); + double length = emscripten_get_audio_stream_length_secs(stream); unsigned int samples = emscripten_get_audio_stream_length(stream); return al_set_sample_instance_position(s->instance, samples * (val / length)); } @@ -221,7 +221,7 @@ SYMBOL_EXPORT bool emscripten_seek_audio_stream_secs(ALLEGRO_AUDIO_STREAM *strea SYMBOL_EXPORT double emscripten_get_audio_stream_position_secs(ALLEGRO_AUDIO_STREAM *stream) { EMSCRIPTEN_AUDIO_STREAM *s = (EMSCRIPTEN_AUDIO_STREAM*)stream; double sample_pos = al_get_sample_instance_position(s->instance); - double length = emscripten_get_audio_stream_length_sec(stream); + double length = emscripten_get_audio_stream_length_secs(stream); unsigned int samples = emscripten_get_audio_stream_length(stream); return length * (sample_pos / (double)samples); } diff --git a/src/emscripten-audio-stream.h b/src/emscripten-audio-stream.h index 09bb042..d06acc3 100644 --- a/src/emscripten-audio-stream.h +++ b/src/emscripten-audio-stream.h @@ -49,7 +49,7 @@ float emscripten_get_audio_stream_gain(ALLEGRO_AUDIO_STREAM* stream); float emscripten_get_audio_stream_pan(ALLEGRO_AUDIO_STREAM* stream); bool emscripten_set_audio_stream_speed(ALLEGRO_AUDIO_STREAM* stream, float val); bool emscripten_set_audio_stream_pan(ALLEGRO_AUDIO_STREAM* stream, float val); -double emscripten_get_audio_stream_length_sec(ALLEGRO_AUDIO_STREAM* stream); +double emscripten_get_audio_stream_length_secs(ALLEGRO_AUDIO_STREAM* stream); bool emscripten_seek_audio_stream_secs(ALLEGRO_AUDIO_STREAM* stream, double val); double emscripten_get_audio_stream_position_secs(ALLEGRO_AUDIO_STREAM* stream); void emscripten_destroy_audio_stream(ALLEGRO_AUDIO_STREAM* stream); @@ -87,7 +87,7 @@ ALLEGRO_AUDIO_STREAM* emscripten_create_audio_stream(size_t fragment_count, unsi #define al_get_audio_stream_speed emscripten_get_audio_stream_speed #define al_get_audio_stream_gain emscripten_get_audio_stream_gain #define al_get_audio_stream_pan emscripten_get_audio_stream_pan -#define al_get_audio_stream_length_sec emscripten_get_audio_stream_length_sec +#define al_get_audio_stream_length_secs emscripten_get_audio_stream_length_secs #define al_get_audio_stream_position_secs emscripten_get_audio_stream_position_secs #define al_get_audio_stream_played_samples emscripten_get_audio_stream_played_samples #define al_get_audio_stream_fragment emscripten_get_audio_stream_fragment