lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes

Browse source
This commit is contained in:
Nikita Lisitsa 2020-09-21 12:25:09 +03:00
parent ec4db5c6cb
commit 87681a036a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libs/audio/source/engine.cpp
View file

@ -179,7 +179,7 @@ namespace psemek::audio
engine::impl::impl() engine::impl::impl()
: sdl_init(sdl2::init(SDL_INIT_AUDIO)) : sdl_init(sdl2::init(SDL_INIT_AUDIO))
{ {
if (Mix_OpenAudio(frequency, AUDIO_S16SYS, 2, 4096) != 0) if (Mix_OpenAudio(engine::frequency, AUDIO_S16SYS, engine::channels, 4096) != 0)
mix_fail("Mix_OpenAudio: "); mix_fail("Mix_OpenAudio: ");
Mix_ChannelFinished(&channel_finished); Mix_ChannelFinished(&channel_finished);
@ -260,11 +260,11 @@ namespace psemek::audio
{ {
Mix_Chunk * chunk = static_cast<Mix_Chunk *>(malloc(sizeof(Mix_Chunk))); Mix_Chunk * chunk = static_cast<Mix_Chunk *>(malloc(sizeof(Mix_Chunk)));
chunk->allocated = copy ? 1 : 0; chunk->allocated = copy ? 1 : 0;
chunk->alen = sample_count * 2; chunk->alen = sample_count * sizeof(std::int16_t);
chunk->volume = 128; chunk->volume = 128;
if (copy) if (copy)
{ {
chunk->abuf = static_cast<Uint8 *>(malloc(sample_count * 2)); chunk->abuf = static_cast<Uint8 *>(malloc(sample_count * sizeof(std::int16_t)));
std::copy(data, data + sample_count, reinterpret_cast<std::int16_t *>(chunk->abuf)); std::copy(data, data + sample_count, reinterpret_cast<std::int16_t *>(chunk->abuf));
} }
else else