empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make some static variables in audioapi functions fields of audioapi class

Browse source
This commit is contained in:
Ilari Liusvaara 2014-06-07 17:37:17 +03:00
parent 8f54db2902
commit 7914d0bd70
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/core/audioapi.hpp
View file

@ -273,6 +273,8 @@ private:
volatile float _music_volume; volatile float _music_volume;
volatile float _voicep_volume; volatile float _voicep_volume;
volatile float _voicer_volume; volatile float _voicer_volume;
resampler music_resampler;
bool last_adjust; //Adjusting consequtively is too hard.
}; };

3
src/core/audioapi.cpp
View file

@ -128,6 +128,7 @@ audioapi_instance::audioapi_instance()
_music_volume = 1; _music_volume = 1;
_voicep_volume = 32767.0; _voicep_volume = 32767.0;
_voicer_volume = 1.0/32768; _voicer_volume = 1.0/32768;
last_adjust = false;
} }
audioapi_instance::~audioapi_instance() audioapi_instance::~audioapi_instance()
@ -233,7 +234,6 @@ void audioapi_instance::submit_buffer(int16_t* samples, size_t count, bool stere
struct audioapi_instance::buffer audioapi_instance::get_music(size_t played) struct audioapi_instance::buffer audioapi_instance::get_music(size_t played)
{ {
static bool last_adjust = false; //Adjusting consequtively is too hard.
unsigned midx = last_complete_music_seen; unsigned midx = last_complete_music_seen;
unsigned midx2 = last_complete_music; unsigned midx2 = last_complete_music;
if(midx2 >= MUSIC_BUFFERS) { if(midx2 >= MUSIC_BUFFERS) {
@ -390,7 +390,6 @@ float audioapi_instance::voicer_volume()
void audioapi_instance::get_mixed(int16_t* samples, size_t count, bool stereo) void audioapi_instance::get_mixed(int16_t* samples, size_t count, bool stereo)
{ {
static resampler music_resampler;
const size_t intbuf_size = 256; const size_t intbuf_size = 256;
float intbuf[intbuf_size]; float intbuf[intbuf_size];
float intbuf2[intbuf_size]; float intbuf2[intbuf_size];