diff options
Diffstat (limited to 'servers/audio/audio_driver_dummy.cpp')
-rw-r--r-- | servers/audio/audio_driver_dummy.cpp | 32 |
1 files changed, 8 insertions, 24 deletions
diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp index ed67e8902a..ff0d2cad65 100644 --- a/servers/audio/audio_driver_dummy.cpp +++ b/servers/audio/audio_driver_dummy.cpp @@ -34,17 +34,16 @@ #include "core/project_settings.h" Error AudioDriverDummy::init() { - active = false; thread_exited = false; exit_thread = false; samples_in = nullptr; - mix_rate = DEFAULT_MIX_RATE; + mix_rate = GLOBAL_GET("audio/mix_rate"); speaker_mode = SPEAKER_MODE_STEREO; channels = 2; - int latency = GLOBAL_DEF_RST("audio/output_latency", DEFAULT_OUTPUT_LATENCY); + int latency = GLOBAL_GET("audio/output_latency"); buffer_frames = closest_power_of_2(latency * mix_rate / 1000); samples_in = memnew_arr(int32_t, buffer_frames * channels); @@ -55,15 +54,12 @@ Error AudioDriverDummy::init() { }; void AudioDriverDummy::thread_func(void *p_udata) { - AudioDriverDummy *ad = (AudioDriverDummy *)p_udata; uint64_t usdelay = (ad->buffer_frames / float(ad->mix_rate)) * 1000000; while (!ad->exit_thread) { - if (ad->active) { - ad->lock(); ad->audio_server_process(ad->buffer_frames, ad->samples_in); @@ -78,38 +74,35 @@ void AudioDriverDummy::thread_func(void *p_udata) { }; void AudioDriverDummy::start() { - active = true; }; int AudioDriverDummy::get_mix_rate() const { - return mix_rate; }; AudioDriver::SpeakerMode AudioDriverDummy::get_speaker_mode() const { - return speaker_mode; }; void AudioDriverDummy::lock() { - - if (!thread) + if (!thread) { return; + } mutex.lock(); }; void AudioDriverDummy::unlock() { - - if (!thread) + if (!thread) { return; + } mutex.unlock(); }; void AudioDriverDummy::finish() { - - if (!thread) + if (!thread) { return; + } exit_thread = true; Thread::wait_to_finish(thread); @@ -121,12 +114,3 @@ void AudioDriverDummy::finish() { memdelete(thread); thread = nullptr; }; - -AudioDriverDummy::AudioDriverDummy() { - - thread = nullptr; -}; - -AudioDriverDummy::~AudioDriverDummy(){ - -}; |