eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 04:39:18 +02:00
Code Issues 123 Wiki Activity

Merge branch 'milek-dev' into gfx-work

Browse Source
This commit is contained in:
milek7
2019-09-12 18:16:04 +02:00
parent f3fd030f8f d71832ea2d
commit f9fe83e0d1
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
audio.cpp
View File

@@ -62,12 +62,15 @@ openal_buffer::openal_buffer( std::string const &Filename ) :
buf[i] = val; buf[i] = val;
} }
id = 0;
alGenBuffers(1, &id); alGenBuffers(1, &id);
if (!id) if (id != null_resource && alIsBuffer(id)) {
throw std::runtime_error("sound: cannot generate buffer"); alGetError();
alBufferData(id, AL_FORMAT_MONO16, buf, si.frames * 2, rate);
alBufferData(id, AL_FORMAT_MONO16, buf, si.frames * 2, rate); }
else {
id = null_resource;
ErrorLog("sound: failed to create AL buffer");
}
delete[] buf; delete[] buf;
delete[] fbuf; delete[] fbuf;

2
audiorenderer.h
View File

@@ -175,7 +175,7 @@ openal_source::bind( sound_source *Controller, uint32_sequence Sounds, Iterator_
First, Last, First, Last,
[&]( audio::buffer_handle const &bufferhandle ) { [&]( audio::buffer_handle const &bufferhandle ) {
auto const &buffer { audio::renderer.buffer( bufferhandle ) }; auto const &buffer { audio::renderer.buffer( bufferhandle ) };
buffers.emplace_back( buffer.id ); } ); if (buffer.id != null_resource) buffers.emplace_back( buffer.id ); } );
if( id != audio::null_resource ) { if( id != audio::null_resource ) {
::alSourceQueueBuffers( id, static_cast<ALsizei>( buffers.size() ), buffers.data() ); ::alSourceQueueBuffers( id, static_cast<ALsizei>( buffers.size() ), buffers.data() );

2
version.h
View File

@@ -1 +1 @@
#define VERSION_INFO "M7 (gfx-work) 7.09.2019" #define VERSION_INFO "M7 (gfx-work) 12.09.2019"