summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-02-20 13:00:19 +0100
committerRémi Verschelde <rverschelde@gmail.com>2019-02-20 13:47:01 +0100
commit51c9ffaec0bea17fd9fc50e536b78963ea104356 (patch)
treebccf6c1a639146fa5448506e09603a522e1f76d4 /drivers
parentf41439c84b206067adeea9c97eaf87fb264ee682 (diff)
Drop RtAudio driver on Windows
We've been defaulting to WASAPI since 3.0 and it's superior to RtAudio in all aspects. Obsoletes and closes #25503. Also enable WINMIDI on MinGW, this had been missed initially. Fix os_windows.cpp and crash_handler_windows.cpp which had weird dependencies on RtAudio.h's includes (ugh).
Diffstat (limited to 'drivers')
-rw-r--r--drivers/SCsub1
-rw-r--r--drivers/rtaudio/SCsub23
-rw-r--r--drivers/rtaudio/audio_driver_rtaudio.cpp205
-rw-r--r--drivers/rtaudio/audio_driver_rtaudio.h65
4 files changed, 0 insertions, 294 deletions
diff --git a/drivers/SCsub b/drivers/SCsub
index 320d4dc4bb..583973c025 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -13,7 +13,6 @@ SConscript('alsa/SCsub')
SConscript('coreaudio/SCsub')
SConscript('pulseaudio/SCsub')
if (env["platform"] == "windows"):
- SConscript("rtaudio/SCsub")
SConscript("wasapi/SCsub")
if env['xaudio2']:
SConscript("xaudio2/SCsub")
diff --git a/drivers/rtaudio/SCsub b/drivers/rtaudio/SCsub
deleted file mode 100644
index 285658073c..0000000000
--- a/drivers/rtaudio/SCsub
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-
-# Not cloning the env, the includes need to be accessible for platform/
-
-# Thirdparty source files
-thirdparty_dir = "#thirdparty/rtaudio/"
-thirdparty_sources = [
- "RtAudio.cpp",
-]
-thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
-
-env.Append(CPPPATH=[thirdparty_dir])
-
-env_thirdparty = env.Clone()
-env_thirdparty.disable_warnings()
-env_thirdparty.add_source_files(env.drivers_sources, thirdparty_sources)
-
-# Driver source files
-env.add_source_files(env.drivers_sources, "*.cpp")
-
-Export('env')
diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp
deleted file mode 100644
index e45621d70f..0000000000
--- a/drivers/rtaudio/audio_driver_rtaudio.cpp
+++ /dev/null
@@ -1,205 +0,0 @@
-/*************************************************************************/
-/* audio_driver_rtaudio.cpp */
-/*************************************************************************/
-/* This file is part of: */
-/* GODOT ENGINE */
-/* https://godotengine.org */
-/*************************************************************************/
-/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
-/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
-/* */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the */
-/* "Software"), to deal in the Software without restriction, including */
-/* without limitation the rights to use, copy, modify, merge, publish, */
-/* distribute, sublicense, and/or sell copies of the Software, and to */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions: */
-/* */
-/* The above copyright notice and this permission notice shall be */
-/* included in all copies or substantial portions of the Software. */
-/* */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-/*************************************************************************/
-
-#include "audio_driver_rtaudio.h"
-
-#include "core/os/os.h"
-#include "core/project_settings.h"
-
-#ifdef RTAUDIO_ENABLED
-
-const char *AudioDriverRtAudio::get_name() const {
-
-#ifdef OSX_ENABLED
- return "RtAudio-OSX";
-#elif defined(UNIX_ENABLED)
- return "RtAudio-ALSA";
-#elif defined(WINDOWS_ENABLED)
- return "RtAudio-DirectSound";
-#else
- return "RtAudio-None";
-#endif
-}
-
-int AudioDriverRtAudio::callback(void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames, double streamTime, RtAudioStreamStatus status, void *userData) {
-
- if (status) {
- if (status & RTAUDIO_INPUT_OVERFLOW) {
- WARN_PRINT("RtAudio input overflow!");
- }
- if (status & RTAUDIO_OUTPUT_UNDERFLOW) {
- WARN_PRINT("RtAudio output underflow!");
- }
- }
- int32_t *buffer = (int32_t *)outputBuffer;
-
- AudioDriverRtAudio *self = (AudioDriverRtAudio *)userData;
-
- if (self->mutex->try_lock() != OK) {
- // what should i do..
- for (unsigned int i = 0; i < nBufferFrames; i++)
- buffer[i] = 0;
-
- return 0;
- }
-
- self->audio_server_process(nBufferFrames, buffer);
-
- self->mutex->unlock();
-
- return 0;
-}
-
-Error AudioDriverRtAudio::init() {
-
- active = false;
- mutex = Mutex::create(true);
- dac = memnew(RtAudio);
-
- ERR_EXPLAIN("Cannot initialize RtAudio audio driver: No devices present.")
- ERR_FAIL_COND_V(dac->getDeviceCount() < 1, ERR_UNAVAILABLE);
-
- // FIXME: Adapt to the OutputFormat -> SpeakerMode change
- /*
- String channels = GLOBAL_DEF_RST("audio/output","stereo");
-
- if (channels=="5.1")
- output_format=OUTPUT_5_1;
- else if (channels=="quad")
- output_format=OUTPUT_QUAD;
- else if (channels=="mono")
- output_format=OUTPUT_MONO;
- else
- output_format=OUTPUT_STEREO;
- */
-
- RtAudio::StreamParameters parameters;
- parameters.deviceId = dac->getDefaultOutputDevice();
- RtAudio::StreamOptions options;
-
- // set the desired numberOfBuffers
- options.numberOfBuffers = 4;
-
- parameters.firstChannel = 0;
- mix_rate = GLOBAL_DEF_RST("audio/mix_rate", DEFAULT_MIX_RATE);
-
- int latency = GLOBAL_DEF("audio/output_latency", DEFAULT_OUTPUT_LATENCY);
- unsigned int buffer_frames = closest_power_of_2(latency * mix_rate / 1000);
- print_verbose("Audio buffer frames: " + itos(buffer_frames) + " calculated latency: " + itos(buffer_frames * 1000 / mix_rate) + "ms");
-
- short int tries = 4;
-
- while (tries > 0) {
- switch (speaker_mode) {
- case SPEAKER_MODE_STEREO: parameters.nChannels = 2; break;
- case SPEAKER_SURROUND_31: parameters.nChannels = 4; break;
- case SPEAKER_SURROUND_51: parameters.nChannels = 6; break;
- case SPEAKER_SURROUND_71: parameters.nChannels = 8; break;
- };
-
- try {
- dac->openStream(&parameters, NULL, RTAUDIO_SINT32, mix_rate, &buffer_frames, &callback, this, &options);
- active = true;
-
- break;
- } catch (RtAudioError) {
- // try with less channels
- ERR_PRINT("Unable to open audio, retrying with fewer channels...");
-
- switch (speaker_mode) {
- case SPEAKER_MODE_STEREO: break; // Required to silence unhandled enum value warning.
- case SPEAKER_SURROUND_31: speaker_mode = SPEAKER_MODE_STEREO; break;
- case SPEAKER_SURROUND_51: speaker_mode = SPEAKER_SURROUND_31; break;
- case SPEAKER_SURROUND_71: speaker_mode = SPEAKER_SURROUND_51; break;
- }
-
- tries--;
- }
- }
-
- return active ? OK : ERR_UNAVAILABLE;
-}
-
-int AudioDriverRtAudio::get_mix_rate() const {
-
- return mix_rate;
-}
-
-AudioDriver::SpeakerMode AudioDriverRtAudio::get_speaker_mode() const {
-
- return speaker_mode;
-}
-
-void AudioDriverRtAudio::start() {
-
- if (active)
- dac->startStream();
-}
-
-void AudioDriverRtAudio::lock() {
-
- if (mutex)
- mutex->lock();
-}
-
-void AudioDriverRtAudio::unlock() {
-
- if (mutex)
- mutex->unlock();
-}
-
-void AudioDriverRtAudio::finish() {
-
- lock();
- if (active && dac->isStreamOpen()) {
- dac->closeStream();
- active = false;
- }
- unlock();
-
- if (mutex) {
- memdelete(mutex);
- mutex = NULL;
- }
- if (dac) {
- memdelete(dac);
- dac = NULL;
- }
-}
-
-AudioDriverRtAudio::AudioDriverRtAudio() :
- speaker_mode(SPEAKER_MODE_STEREO),
- mutex(NULL),
- dac(NULL),
- mix_rate(DEFAULT_MIX_RATE),
- active(false) {
-}
-
-#endif
diff --git a/drivers/rtaudio/audio_driver_rtaudio.h b/drivers/rtaudio/audio_driver_rtaudio.h
deleted file mode 100644
index ac4eee4947..0000000000
--- a/drivers/rtaudio/audio_driver_rtaudio.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*************************************************************************/
-/* audio_driver_rtaudio.h */
-/*************************************************************************/
-/* This file is part of: */
-/* GODOT ENGINE */
-/* https://godotengine.org */
-/*************************************************************************/
-/* Copyright (c) 2007-2019 Juan Linietsky, Ariel Manzur. */
-/* Copyright (c) 2014-2019 Godot Engine contributors (cf. AUTHORS.md) */
-/* */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the */
-/* "Software"), to deal in the Software without restriction, including */
-/* without limitation the rights to use, copy, modify, merge, publish, */
-/* distribute, sublicense, and/or sell copies of the Software, and to */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions: */
-/* */
-/* The above copyright notice and this permission notice shall be */
-/* included in all copies or substantial portions of the Software. */
-/* */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-/*************************************************************************/
-
-#ifndef AUDIO_DRIVER_RTAUDIO_H
-#define AUDIO_DRIVER_RTAUDIO_H
-
-#ifdef RTAUDIO_ENABLED
-
-#include "servers/audio_server.h"
-
-#include <RtAudio.h>
-
-class AudioDriverRtAudio : public AudioDriver {
-
- static int callback(void *outputBuffer, void *inputBuffer, unsigned int nBufferFrames,
- double streamTime, RtAudioStreamStatus status, void *userData);
- SpeakerMode speaker_mode;
- Mutex *mutex;
- RtAudio *dac;
- int mix_rate;
- bool active;
-
-public:
- virtual const char *get_name() const;
-
- virtual Error init();
- virtual void start();
- virtual int get_mix_rate() const;
- virtual SpeakerMode get_speaker_mode() const;
- virtual void lock();
- virtual void unlock();
- virtual void finish();
-
- AudioDriverRtAudio();
-};
-
-#endif // AUDIO_DRIVER_RTAUDIO_H
-#endif