PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-07 21:56:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

emscripten_seek_audio_stream_secs: return end position after the sample has ended

Browse source 
Samples in Allegro return 0.0 in this case, while streams return the stream length.
This commit is contained in:
Sebastian Krzyszkowiak 2019-01-07 00:39:06 +01:00
parent 5fb99a97f8
commit fdb4a29a13
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/emscripten-audio-stream.c
View file

@ -59,6 +59,7 @@ SYMBOL_EXPORT ALLEGRO_AUDIO_STREAM *emscripten_load_audio_stream(const char* fil
EMSCRIPTEN_AUDIO_STREAM *stream = calloc(1, sizeof(EMSCRIPTEN_AUDIO_STREAM)); EMSCRIPTEN_AUDIO_STREAM *stream = calloc(1, sizeof(EMSCRIPTEN_AUDIO_STREAM));
stream->sample = al_load_sample(filename); stream->sample = al_load_sample(filename);
stream->instance = al_create_sample_instance(stream->sample); stream->instance = al_create_sample_instance(stream->sample);
stream->old_pos = 0.0;
al_set_sample_instance_playing(stream->instance, true); al_set_sample_instance_playing(stream->instance, true);
return (ALLEGRO_AUDIO_STREAM*)stream; return (ALLEGRO_AUDIO_STREAM*)stream;
} }
@ -67,6 +68,7 @@ SYMBOL_EXPORT ALLEGRO_AUDIO_STREAM *emscripten_load_audio_stream_f(ALLEGRO_FILE
EMSCRIPTEN_AUDIO_STREAM *stream = calloc(1, sizeof(EMSCRIPTEN_AUDIO_STREAM)); EMSCRIPTEN_AUDIO_STREAM *stream = calloc(1, sizeof(EMSCRIPTEN_AUDIO_STREAM));
stream->sample = al_load_sample_f(file, ident); stream->sample = al_load_sample_f(file, ident);
stream->instance = al_create_sample_instance(stream->sample); stream->instance = al_create_sample_instance(stream->sample);
stream->old_pos = 0.0;
al_set_sample_instance_playing(stream->instance, true); al_set_sample_instance_playing(stream->instance, true);
return (ALLEGRO_AUDIO_STREAM*)stream; return (ALLEGRO_AUDIO_STREAM*)stream;
} }
@ -223,7 +225,14 @@ SYMBOL_EXPORT double emscripten_get_audio_stream_position_secs(ALLEGRO_AUDIO_STR
double sample_pos = al_get_sample_instance_position(s->instance); double sample_pos = al_get_sample_instance_position(s->instance);
double length = emscripten_get_audio_stream_length_secs(stream); double length = emscripten_get_audio_stream_length_secs(stream);
unsigned int samples = emscripten_get_audio_stream_length(stream); unsigned int samples = emscripten_get_audio_stream_length(stream);
return length * (sample_pos / (double)samples); double pos = length * (sample_pos / (double)samples);
// hack needed to return the end after the stream has ended (samples rollback to 0.0 instead)
if (s->old_pos > 0.0 && pos == 0.0) {
return length;
} else {
s->old_pos = pos;
return pos;
}
} }
SYMBOL_EXPORT void emscripten_destroy_audio_stream(ALLEGRO_AUDIO_STREAM *stream) { SYMBOL_EXPORT void emscripten_destroy_audio_stream(ALLEGRO_AUDIO_STREAM *stream) {

1
src/emscripten-audio-stream.h
View file

@ -26,6 +26,7 @@
typedef struct { typedef struct {
ALLEGRO_SAMPLE* sample; ALLEGRO_SAMPLE* sample;
ALLEGRO_SAMPLE_INSTANCE* instance; ALLEGRO_SAMPLE_INSTANCE* instance;
double old_pos;
} EMSCRIPTEN_AUDIO_STREAM; } EMSCRIPTEN_AUDIO_STREAM;
ALLEGRO_AUDIO_STREAM* emscripten_load_audio_stream(const char* filename, size_t buffer_count, unsigned int samples); ALLEGRO_AUDIO_STREAM* emscripten_load_audio_stream(const char* filename, size_t buffer_count, unsigned int samples);